commit 0a420e804ef48d9c1556dea1838fc32c2135bfa9
author Tyler Gunn <tgunn@google.com> Mon Oct 14 09:57:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 14 09:57:48 2019 -0700
tree e983983512ba6f7541e7752cb4e013e550c30858
parent c73add5d9b4501c67af7410fcae9c48e70736c45
parent 924018659d3ebe3d275a6abf4b6333e9044624d7

Merge "Explicitly grant START_ACTIVITIES_FROM_BACKGROUND to com.android.phone." am: d6de97ba8b am: ce724cbe9e
am: 924018659d

Change-Id: I5ac8e33e54f4015fed6bbd5a3b354f2ae7447238

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e188bc7..e930e37 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -200,6 +200,10 @@
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
     <uses-permission android:name="android.permission.READ_PRECISE_PHONE_STATE" />
     <uses-permission android:name="android.permission.MANAGE_ROLE_HOLDERS" />
+    <!-- Allows us to whitelist receivers of the
+         ACTION_SIM_SLOT_STATUS_CHANGED broadcast to start activities
+         from the background.  -->
+    <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
 
     <application android:name="PhoneApp"
             android:persistent="true"