commit a2a2618200a8cd4008f727624491aef51ef3c729
author Meng Wang <mewan@google.com> Wed Oct 02 14:27:09 2019 -0700
committer Meng Wang <mewan@google.com> Fri Oct 11 21:48:49 2019 +0000
tree eac051088e6756645c2e81460bbe9735cc2bf5e3
parent 1f5858376280b8ff7e2f7265cc86095261f7843e

Do not use hidden API PowerManager#wakeUp

Replaced with FLAG_KEEP_SCREEN_ON and FLAG_TURN_SCREEN_ON to make
the alert dialog turning on screen.

Bug: 137202333
Test: manual sanity by triggering error message in call.
Change-Id: I3ba145fbe3eb69ca39c64523f02082a5d7bd2aeb

src/com/android/phone/PhoneDisplayMessage.java

diff --git a/src/com/android/phone/PhoneDisplayMessage.java b/src/com/android/phone/PhoneDisplayMessage.java
index 2b86a61..199fbb8 100644
--- a/src/com/android/phone/PhoneDisplayMessage.java
+++ b/src/com/android/phone/PhoneDisplayMessage.java
@@ -78,10 +78,11 @@
         sDisplayMessageDialog.getWindow().setType(
                 WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);
         sDisplayMessageDialog.getWindow().addFlags(
-                WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+                WindowManager.LayoutParams.FLAG_DIM_BEHIND
+                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         sDisplayMessageDialog.show();
-        PhoneGlobals.getInstance().wakeUpScreen();
     }
 
     /**
@@ -91,6 +92,9 @@
         if (DBG) log("Dissmissing Display Info Record...");
 
         if (sDisplayMessageDialog != null) {
+            sDisplayMessageDialog.getWindow().clearFlags(
+                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                    | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             sDisplayMessageDialog.dismiss();
             sDisplayMessageDialog = null;
         }