commit 99f2fd32b8be0443530121d6a36b21d997bb8ffd
author Ben Murdoch <benm@google.com> Fri Oct 08 05:12:05 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 08 05:12:05 2010 -0700
tree 6653bde835864e7a341bf9859135275df518c8a9
parent f8bdfce9f2fc93bed2667694dc5b5ddf001d99d2
parent 8829aa3afffe3b5637eed31fbe0265d7705f0376

Merge "Fix NPE in PersonalPreferencesFragment"

src/com/android/browser/preferences/PersonalPreferencesFragment.java

diff --git a/src/com/android/browser/preferences/PersonalPreferencesFragment.java b/src/com/android/browser/preferences/PersonalPreferencesFragment.java
index f8a7563..656d47a 100644
--- a/src/com/android/browser/preferences/PersonalPreferencesFragment.java
+++ b/src/com/android/browser/preferences/PersonalPreferencesFragment.java
@@ -85,7 +85,9 @@
         Account[] accounts = am.getAccountsByType("com.google");
         if (accounts == null || accounts.length == 0) {
             // No Google accounts setup, don't offer Chrome sync
-            getPreferenceScreen().removePreference(mChromeSync);
+            if (mChromeSync != null) {
+                getPreferenceScreen().removePreference(mChromeSync);
+            }
         } else {
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
             Bundle args = mChromeSync.getExtras();