PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9

Browse Source 
Change-Id: I0f6034dca48a2f0e6461f6b0559bee0c81410f3f
This commit is contained in:
Automerger Merge Worker
2020-03-13 12:07:15 +00:00
parent 10ff4f4ab6 18bf77eef9
commit 3fd54b4e67
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AndroidManifest.xml
View File

@@ -372,13 +372,11 @@
android:value="true" /> android:value="true" />
</activity> </activity>
<!-- Runs in the phone process since it needs access to UiccController -->
<activity android:name="Settings$ApnSettingsActivity" <activity android:name="Settings$ApnSettingsActivity"
android:label="@string/apn_settings" android:label="@string/apn_settings"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|keyboardHidden|screenSize"
android:parentActivityName="Settings$NetworkDashboardActivity" android:parentActivityName="Settings$NetworkDashboardActivity"
android:process="com.android.phone"> android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.APN_SETTINGS" /> <action android:name="android.settings.APN_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -1426,8 +1424,7 @@
</activity> </activity>
<activity android:name="Settings$IccLockSettingsActivity" <activity android:name="Settings$IccLockSettingsActivity"
android:label="@string/sim_lock_settings" android:label="@string/sim_lock_settings">
android:process="com.android.phone">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />