commit 1ecaf7c777cdf303e91ecc636af7814fb381f9af
author Makoto Onuki <omakoto@google.com> Mon Nov 27 14:05:53 2017 -0800
committer Makoto Onuki <omakoto@google.com> Mon Nov 27 14:05:53 2017 -0800
tree d5e37a3974ddd5440f1cc4d00c76753d747c3944
parent 9b5696844d66eb45e109ec5395e42fb5f1520ccf

Don't show the battery saver toast when the screen turns on

Bug 68769804
Test: manual test

Change-Id: I4eca183f5e61d31d162d3d0914fe2dc94bb8a11e

services/core/java/com/android/server/power/batterysaver/BatterySaverController.java

diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java
index ae01ea57..483d518 100644
--- a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java
+++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java
@@ -217,13 +217,6 @@
             pmi.powerHint(PowerHint.LOW_POWER, enabled ? 1 : 0);
         }
 
-        if (enabled) {
-            // STOPSHIP Remove the toast.
-            Toast.makeText(mContext,
-                    com.android.internal.R.string.battery_saver_warning,
-                    Toast.LENGTH_LONG).show();
-        }
-
         if (ArrayUtils.isEmpty(fileValues)) {
             mFileUpdater.restoreDefault();
         } else {
@@ -231,6 +224,13 @@
         }
 
         if (sendBroadcast) {
+            if (enabled) {
+                // STOPSHIP Remove the toast.
+                Toast.makeText(mContext,
+                        com.android.internal.R.string.battery_saver_warning,
+                        Toast.LENGTH_LONG).show();
+            }
+
             if (DEBUG) {
                 Slog.i(TAG, "Sending broadcasts for mode: " + enabled);
             }