commit 945bac371785685cdba9e3818c80cc593b005bd1
author Kweku Adams <kwekua@google.com> Tue Jan 16 23:54:01 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 16 23:54:01 2024 +0000
tree 85ec2fac24efb5b23232cb190ef21705200216a5
parent 0d2ed528c3997ee3e48c22ecdd917c4f3d0d634a
parent ce1f5cd184d8d4c3e741431768a17f1a51ec9ac8

Merge "Fix conditional check bug." into main

services/core/java/com/android/server/power/PowerManagerService.java

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index e226953..a172de0 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -4413,8 +4413,8 @@
 
     private boolean setPowerModeInternal(int mode, boolean enabled) {
         // Maybe filter the event.
-        if (mBatterySaverStateMachine == null || (mode == Mode.LAUNCH && enabled
-                && mBatterySaverStateMachine.getBatterySaverController().isLaunchBoostDisabled())) {
+        if (mode == Mode.LAUNCH && enabled && mBatterySaverStateMachine != null
+                && mBatterySaverStateMachine.getBatterySaverController().isLaunchBoostDisabled()) {
             return false;
         }
         return mNativeWrapper.nativeSetPowerMode(mode, enabled);