commit ac68e5b23fb10945fe5ea45cd38f0e1c82411b90
author Bonian Chen <bonianchen@google.com> Wed Feb 12 04:31:21 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 12 04:31:21 2020 +0000
tree 90fa673787a61a50e19b2927814157222aa419c3
parent d833301c25fc5ecaea1a3bf65e983c81ca989ab1
parent cd1fd106c936a3704bfae432ae7f9f2cfa629e1e

Merge "[Settings] Avoid binding with phone process"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9f8d648..4996aeb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -384,12 +384,10 @@
                 android:value="true" />
         </activity>
 
-        <!-- Runs in the phone process since it needs access to UiccController -->
         <activity android:name="Settings$ApnSettingsActivity"
                 android:label="@string/apn_settings"
                 android:launchMode="singleTask"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:process="com.android.phone">
+                android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APN_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1422,8 +1420,7 @@
         </activity>
 
         <activity android:name="Settings$IccLockSettingsActivity"
-                android:label="@string/sim_lock_settings"
-                android:process="com.android.phone">
+                android:label="@string/sim_lock_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />