| commit | 92bd820846af5722a9fb255f223fddc2182623a1 | [log] [tgz] |
|---|---|---|
| author | Shawn Lee <syeonlee@google.com> | Thu Dec 08 23:14:48 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 08 23:14:48 2022 +0000 |
| tree | e1b3562d377c4302a301b030ebf7c675d636ada5 | |
| parent | 42bfd271b2a8a0b29a738884ce6ed265255eb92d [diff] | |
| parent | 99d84f1753709129ec73f1c2b8c4e28994f19742 [diff] |
Merge "Fixes AOSP EmergencyDialer failing to occlude Keyguard" into tm-qpr-dev am: c9e16364dd am: 99d84f1753 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/20627834 Change-Id: I58ece08470ea323331817af8a7f0b1cc15ad2c54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bf6872e..0e32e40 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -199,6 +199,7 @@ android:label="@string/emergencyDialerIconLabel" android:theme="@style/EmergencyDialerTheme" android:screenOrientation="portrait" + android:showWhenLocked="true" android:exported="true" android:resizeableActivity="false"> <intent-filter>
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);