commit d24f289548d8e350c775ba57b25c83d446b0d462
author YUKAI HUNG <ykhung@google.com> Fri Sep 24 02:28:41 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 24 02:28:41 2021 +0000
tree e0763afa8b09f3c1e706071dfc4be9c163c20a08
parent 93f6df76be2559900cf4deec56cbc7a5954935b6
parent a8a2075fd021cc4c75fe5cd0538172f596d9b4df

Merge "[Security] resolve overlay attack on RequestIgnoreBatteryOptimizations" into sc-v2-dev

src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java

diff --git a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index c6cdcf2..ee46090 100644
--- a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -42,6 +42,8 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().addSystemFlags(android.view.WindowManager.LayoutParams
+                .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
 
         mPowerWhitelistManager = getSystemService(PowerWhitelistManager.class);
 
@@ -99,13 +101,6 @@
     }
 
     @Override
-    protected void onStart() {
-        super.onStart();
-        getWindow().addSystemFlags(android.view.WindowManager.LayoutParams
-                .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
-    }
-
-    @Override
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE: