PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Potential fix for a monkey-related NPE

Browse Source 
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
This commit is contained in:
Amith Yamasani
2013-04-09 10:22:47 -07:00
parent 645e78d806
commit 350938ecc6
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -20,6 +20,7 @@ import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
import android.app.Fragment; import android.app.Fragment;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -48,6 +49,9 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
private String mHelpUrl; private String mHelpUrl;
// Cache the content resolver for async callbacks
private ContentResolver mContentResolver;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
@@ -104,7 +108,11 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
* Returns the ContentResolver from the owning Activity. * Returns the ContentResolver from the owning Activity.
*/ */
protected ContentResolver getContentResolver() { protected ContentResolver getContentResolver() {
return getActivity().getContentResolver(); Context context = getActivity();
if (context != null) {
mContentResolver = context.getContentResolver();
}
return mContentResolver;
} }
/** /**