commit 0cad779d3e4d7ef361fa972e54879cd6791b467c
author Alexandra Gherghina <alexgherghina@google.com> Mon Aug 18 16:50:04 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 16 04:29:45 2014 +0000
tree 69dc46b475d88b34eb704d34858ac192bb5b5b2b
parent cd88c2f7c30fe58e523e93469dd1fc7a121320f3
parent f2e39f2ee4f07cfff3915a17b1a394c99e5e7f44

Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev

src/com/android/settings/accounts/AccountSettings.java

diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 2eb89b0..891fdbb 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -137,7 +137,7 @@
                             currentProfile.getIdentifier()));
             menu.findItem(R.id.account_settings_menu_auto_sync_personal).setVisible(false);
             menu.findItem(R.id.account_settings_menu_auto_sync_work).setVisible(false);
-        } else {
+        } else if (mProfiles.size() > 1) {
             // We assume there's only one managed profile, otherwise UI needs to change
             final UserHandle managedProfile = mProfiles.valueAt(1).userInfo.getUserHandle();
 
@@ -152,6 +152,8 @@
                     .setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser(
                             managedProfile.getIdentifier()));
             menu.findItem(R.id.account_settings_menu_auto_sync).setVisible(false);
+         } else {
+             Log.w(TAG, "Method onPrepareOptionsMenu called before mProfiles was initialized");
          }
     }