Sync up to v216
This commit is contained in:
@@ -1,31 +0,0 @@
|
||||
From 807d3807f81b4893cd5186c60cfcf94920281a41 Mon Sep 17 00:00:00 2001
|
||||
From: Steve Kondik <steve@cyngn.com>
|
||||
Date: Sat, 3 Jan 2015 05:13:26 -0800
|
||||
Subject: [PATCH 16/36] power: Disable keyboard/button lights while
|
||||
dozing/dreaming
|
||||
|
||||
* With hardkeys and doze mode enabled, entering suspend results in
|
||||
an epic battle over the lights. It's a bad situation. Disable
|
||||
them when we're sleepy.
|
||||
|
||||
Change-Id: I7f1fc35a1573717d1ea101a07c4171d6f66d1553
|
||||
---
|
||||
.../core/java/com/android/server/power/PowerManagerService.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
|
||||
index 5cccc77ac53..e7d5315a2b9 100644
|
||||
--- a/services/core/java/com/android/server/power/PowerManagerService.java
|
||||
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
|
||||
@@ -2040,7 +2040,7 @@ public final class PowerManagerService extends SystemService
|
||||
final long nextProfileTimeout = getNextProfileTimeoutLocked(now);
|
||||
|
||||
mUserActivitySummary = 0;
|
||||
- if (mLastUserActivityTime >= mLastWakeTime) {
|
||||
+ if (mWakefulness == WAKEFULNESS_AWAKE && mLastUserActivityTime >= mLastWakeTime) {
|
||||
nextTimeout = mLastUserActivityTime
|
||||
+ screenOffTimeout - screenDimDuration;
|
||||
if (now < nextTimeout) {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From bd6e789f55e396d1672f97f5f95761b23044e2b4 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Thu, 9 Apr 2020 22:57:47 +0200
|
||||
Subject: [PATCH 58/58] Additional fod command for non-optical samsung devices
|
||||
running Q vendor
|
||||
|
||||
---
|
||||
.../com/android/server/biometrics/fingerprint/FacolaView.java | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FacolaView.java b/services/core/java/com/android/server/biometrics/fingerprint/FacolaView.java
|
||||
index 42f21d63430..a87f7e78af4 100644
|
||||
--- a/services/core/java/com/android/server/biometrics/fingerprint/FacolaView.java
|
||||
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FacolaView.java
|
||||
@@ -307,6 +307,7 @@ public class FacolaView extends ImageView implements OnTouchListener {
|
||||
writeFile("/sys/kernel/oppo_display/dimlayer_hbm", "1");
|
||||
if(samsungFod) {
|
||||
samsungCmd("fod_enable,1,1");
|
||||
+ samsungCmd("fod_enable,1,1,0");
|
||||
}
|
||||
if(mX == -1 || mY == -1 || mW == -1 || mH == -1) return;
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Reference in New Issue
Block a user