summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/sim
diff options
context:
space:
mode:
authorDiogo Ferreira <diogo@underdev.org>2016-02-09 18:17:43 +0000
committerClark Scheff <clark@cyngn.com>2016-02-16 14:55:43 -0800
commit1eb75899a890907cdd18868336d3329242cb9e60 (patch)
treee8d6d207b519df030cf6b63c48f7481e07aac218 /src/com/android/settings/sim
parent55abf844c0c1e4dc93b87d0977ed1ff294a9266d (diff)
downloadpackages_apps_Settings-1eb75899a890907cdd18868336d3329242cb9e60.zip
packages_apps_Settings-1eb75899a890907cdd18868336d3329242cb9e60.tar.gz
packages_apps_Settings-1eb75899a890907cdd18868336d3329242cb9e60.tar.bz2
SIM: Only trigger sub updates if the lifecycle isn't ending
This broadcast would cause a re-rendering of the sim preferences but the activity context is actually tearing down at that point which causes common context items such as resources items to be null. Change-Id: I5cb23f941c9ace6382dbc324c8e1820f54853eda TICKET:CYNGNOS-1918
Diffstat (limited to 'src/com/android/settings/sim')
-rw-r--r--src/com/android/settings/sim/SimSettings.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 5f7ca31..20a401e 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -16,6 +16,7 @@
package com.android.settings.sim;
+import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog;
@@ -168,7 +169,10 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
@Override
public void onSubscriptionsChanged() {
if (DBG) log("onSubscriptionsChanged:");
- updateSubscriptions();
+ Activity activity = getActivity();
+ if (activity != null && !activity.isFinishing()) {
+ updateSubscriptions();
+ }
}
};