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

am 350938ec: Potential fix for a monkey-related NPE

Browse Source 
* commit '350938ecc69085badef2edc16491ff7a461dfb08':
  Potential fix for a monkey-related NPE
This commit is contained in:
Amith Yamasani
2013-04-09 10:35:12 -07:00
committed by Android Git Automerger
parent 54f1b92466 350938ecc6
commit 631285a43f
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.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;
}
/**