Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c3e5657 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

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

parents 4d6fe137 ca915668

AndroidManifest.xml

+14 −1
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/ApnSettings.java

+7 −1
Original line number Diff line number Diff line
@@ -120,12 +120,18 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
        super.onCreate(icicle);



        addPreferencesFromResource(R.xml.apn_settings);

        getListView().setItemsCanFocus(true);



        mMobileStateFilter = new IntentFilter(

                TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);

    }



    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);



        getListView().setItemsCanFocus(true);

    }



    @Override

    public void onResume() {

        super.onResume();

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -88,5 +88,6 @@ public class Settings extends SettingsActivity { 
    public static class PrintJobSettingsActivity extends SettingsActivity { /* empty */ }



    public static class TopLevelSettings extends SettingsActivity { /* empty */ }

    public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }

}

src/com/android/settings/SettingsActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ public class SettingsActivity extends Activity 
            PaymentSettings.class.getName(),

            KeyboardLayoutPickerFragment.class.getName(),

            ChooseAccountFragment.class.getName(),

            DashboardSummary.class.getName()

            DashboardSummary.class.getName(),

            ApnSettings.class.getName()

    };



    private SharedPreferences mDevelopmentPreferences;