treble/device_phh_cats22flip
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Missed a semicolon

Browse Source
This commit is contained in:
Nehemiah of Zebulun 2023-12-04 11:31:24 -05:00
parent 162369b604
commit aeebff4764
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
patches/button_backlight.patch
View File

@ -1,8 +1,11 @@
diff --git a/core/res/assets/images/android-logo-mask.png b/core/res/assets/images/android-logo-mask.png
index 5512c0ad8a83..a998f1d52313 100644
Binary files a/core/res/assets/images/android-logo-mask.png and b/core/res/assets/images/android-logo-mask.png differ
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 7c0f4197363..16758ba496e 100644 index 4bc70cf5856e..09c5fd36ea7d 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java --- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -63,7 +63,12 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory; @@ -82,7 +82,12 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings; import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings;
import com.android.server.policy.WindowManagerPolicy; import com.android.server.policy.WindowManagerPolicy;
@ -12,11 +15,11 @@ index 7c0f4197363..16758ba496e 100644
+import java.io.IOException; +import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
+import java.io.Writer; +import java.io.Writer;
import java.util.List; import java.util.Objects;
/** /**
@@ -561,6 +566,18 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call @@ -1292,6 +1297,18 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mDisplayWhiteBalanceController = displayWhiteBalanceController; }
} }
+ private void changeKeyboardBacklightState(String value) { + private void changeKeyboardBacklightState(String value) {
@ -31,31 +34,30 @@ index 7c0f4197363..16758ba496e 100644
+ } + }
+ } + }
+ +
private Sensor findDisplayLightSensor(String sensorType) { private void loadBrightnessRampRates() {
if (!TextUtils.isEmpty(sensorType)) { mBrightnessRampRateFastDecrease = mDisplayDeviceConfig.getBrightnessRampFastDecrease();
List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL); mBrightnessRampRateFastIncrease = mDisplayDeviceConfig.getBrightnessRampFastIncrease();
@@ -1154,6 +1171,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call @@ -2005,6 +2022,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
&& mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) { && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) {
setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON); setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON);
mWindowManagerPolicy.screenTurnedOn(); mWindowManagerPolicy.screenTurnedOn(mDisplayId);
+ changeKeyboardBacklightState("255"); + changeKeyboardBacklightState("255");
} }
// Grab a wake lock if we have unfinished business. // Grab a wake lock if we have unfinished business.
@@ -1310,6 +1328,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call @@ -2264,6 +2282,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF); setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
unblockScreenOn(); unblockScreenOn();
mWindowManagerPolicy.screenTurnedOff(); mWindowManagerPolicy.screenTurnedOff(mDisplayId, mIsInTransition);
+ changeKeyboardBacklightState("0"); + changeKeyboardBacklightState("0");
} else if (!isOff } else if (!isOff
&& mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_OFF) { && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_OFF) {
@@ -1317,6 +1336,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call @@ -2272,6 +2291,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// Complete the full state transition on -> turningOff -> off.
unblockScreenOff(); unblockScreenOff();
mWindowManagerPolicy.screenTurnedOff(); mWindowManagerPolicy.screenTurnedOff(mDisplayId, mIsInTransition);
+ changeKeyboardBacklightState("0");
setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF); setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
+ changeKeyboardBacklightState("0");
} }
if (!isOff && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_OFF) { if (!isOff
&& (mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_OFF