commit c9e16364dd5bf5e624a91a72db2e61da5c88240a
author Shawn Lee <syeonlee@google.com> Thu Dec 08 22:16:05 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 08 22:16:05 2022 +0000
tree e9617e4ecba1b3eb2d15ae830606ba89eb5bdcda
parent a1b9c803b093836a28a162c7f52f15c606a686cc
parent 8854ed3a1128a0cc8a619256267a6cb7c448ccfd

Merge "Fixes AOSP EmergencyDialer failing to occlude Keyguard" into tm-qpr-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 41ff216..8fbecb1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -193,6 +193,7 @@
             android:label="@string/emergencyDialerIconLabel"
             android:theme="@style/EmergencyDialerTheme"
             android:screenOrientation="portrait"
+            android:showWhenLocked="true"
             android:exported="true"
             android:resizeableActivity="false">
             <intent-filter>

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 9b7a43e..5fe8708 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -259,8 +259,6 @@
         mEntryType = getIntent().getIntExtra(EXTRA_ENTRY_TYPE, ENTRY_TYPE_UNKNOWN);
         Log.d(LOG_TAG, "Launched from " + entryTypeToString(mEntryType));
 
-        // Allow this activity to be displayed in front of the keyguard / lockscreen.
-        setShowWhenLocked(true);
         // Allow turning screen on
         setTurnScreenOn(true);