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

Commit 6b68b000 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment... 

am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev

* commit '94dce761':
  Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
parents 9e6c6b9f 94dce761

src/com/android/settings/ApnSettings.java

+7 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings;



import android.app.Activity;

import android.app.Dialog;

import android.app.ProgressDialog;

import android.content.BroadcastReceiver;
@@ -171,8 +172,6 @@ public class ApnSettings extends SettingsPreferenceFragment implements 


        if (!mRestoreDefaultApnMode) {

            fillList();

        } else {

            showDialog(DIALOG_RESTORE_DEFAULTAPN);

        }

    }
@@ -348,12 +347,17 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
        public void handleMessage(Message msg) {

            switch (msg.what) {

                case EVENT_RESTORE_DEFAULTAPN_COMPLETE:

                    Activity activity = getActivity();

                    if (activity == null) {

                        mRestoreDefaultApnMode = false;

                        return;

                    }

                    fillList();

                    getPreferenceScreen().setEnabled(true);

                    mRestoreDefaultApnMode = false;

                    removeDialog(DIALOG_RESTORE_DEFAULTAPN);

                    Toast.makeText(

                        getActivity(),

                        activity,

                        getResources().getString(

                                R.string.restore_default_apn_completed),

                        Toast.LENGTH_LONG).show();