commit c078236fafb0a1c78a619dc590481c40dce1c8c7
author Brad Ebinger <breadley@google.com> Mon Oct 14 16:56:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 14 16:56:28 2019 +0000
tree abdf1205ee79978b1bab3435b6ac24132d4ce6fb
parent d6de97ba8b9ad57938c08394d0b5562008d1e89a
parent 482ba19b414f93a615c8b72e76aaef60dab4b6cf

Merge "Rename setConverted."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0fc17ba..c4c33ca 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -138,7 +138,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_APN_SETTINGS" />
     <uses-permission android:name="android.permission.BROADCAST_SMS"/>
     <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"/>
@@ -170,7 +169,6 @@
     <uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" />
     <uses-permission android:name="android.permission.BIND_EUICC_SERVICE" />
     <uses-permission android:name="com.android.permission.BIND_TELEPHONY_NETWORK_SERVICE" />
-    <uses-permission android:name="android.permission.BIND_CELL_BROADCAST_SERVICE" />
     <uses-permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
@@ -201,6 +199,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"