commit ca915668af1dfea973c2789d9ae48c958ca8362d
author Fabrice Di Meglio <fdimeglio@google.com> Thu Feb 06 15:46:19 2014 -0800
committer Fabrice Di Meglio <fdimeglio@google.com> Thu Feb 06 17:23:03 2014 -0800
tree f6fdcdda70c0eff6123590d1cf7e11429321b0e1
parent d3aee23cb69dbee295ede91b7980b947dcf78272

Fix bug #12910775 Settings crash after tap on Access Point Names under Mobile networks

- ApnSettings is now a fragment so introduce a new ApnSettingsActivity
- ApsSettingsActivity will use the ApnSettings fragment
- move the getListView() call to onActivityCreated(...) as the ListView
needs to be created before this call can be done.
- add also an alias for the old activity name ".ApsSettings"

Change-Id: Id228722d7f34415d4b036282f0845e28546111df

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6e01aec..cc407db 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -259,7 +259,7 @@
             </intent-filter>
         </activity-alias>
 
-        <activity android:name="ApnSettings"
+        <activity android:name="Settings$ApnSettingsActivity"
                 android:label="@string/apn_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:launchMode="singleTask"
@@ -270,8 +270,21 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.ApnSettings" />
         </activity>
 
+        <!-- Keep compatibility with old shortcuts. -->
+        <activity-alias android:name=".ApnSettings"
+                        android:label="@string/apn_settings"
+                        android:configChanges="orientation|keyboardHidden|screenSize"
+                        android:launchMode="singleTask"
+                        android:exported="true"
+                        android:targetActivity="Settings$ApnSettingsActivity">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.ApnSettings" />
+        </activity-alias>
+
         <activity android:name="Settings$BluetoothSettingsActivity"
                 android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/bluetooth_settings_title"