diff options
author | Amith Yamasani <yamasani@google.com> | 2013-04-09 10:22:47 -0700 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2013-04-09 10:25:43 -0700 |
commit | 350938ecc69085badef2edc16491ff7a461dfb08 (patch) | |
tree | be8c6ef9b8f648e131090e6439bc5f8012b6f2fd /src/com/android/settings/SettingsPreferenceFragment.java | |
parent | 645e78d8063169fa59b69bdc83ac5a62840d3253 (diff) | |
download | packages_apps_Settings-350938ecc69085badef2edc16491ff7a461dfb08.zip packages_apps_Settings-350938ecc69085badef2edc16491ff7a461dfb08.tar.gz packages_apps_Settings-350938ecc69085badef2edc16491ff7a461dfb08.tar.bz2 |
Potential fix for a monkey-related NPE
Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.
Bug: 8005271
Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608
Diffstat (limited to 'src/com/android/settings/SettingsPreferenceFragment.java')
-rw-r--r-- | src/com/android/settings/SettingsPreferenceFragment.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index 42c0b40..60765a9 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -20,6 +20,7 @@ import android.app.Dialog; import android.app.DialogFragment; import android.app.Fragment; import android.content.ContentResolver; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; @@ -48,6 +49,9 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di private String mHelpUrl; + // Cache the content resolver for async callbacks + private ContentResolver mContentResolver; + @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -104,7 +108,11 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di * Returns the ContentResolver from the owning Activity. */ protected ContentResolver getContentResolver() { - return getActivity().getContentResolver(); + Context context = getActivity(); + if (context != null) { + mContentResolver = context.getContentResolver(); + } + return mContentResolver; } /** |