diff options
| author | Alexandra Gherghina <alexgherghina@google.com> | 2014-08-18 14:34:08 +0100 |
|---|---|---|
| committer | Alexandra Gherghina <alexgherghina@google.com> | 2014-08-18 14:34:13 +0100 |
| commit | cd88c2f7c30fe58e523e93469dd1fc7a121320f3 (patch) | |
| tree | bfc72ab9390598569373910285240fb66c7635af /src/com/android/settings/accounts | |
| parent | f14fa7ed4e9c61543a10f081027489558c4bc104 (diff) | |
| download | packages_apps_Settings-cd88c2f7c30fe58e523e93469dd1fc7a121320f3.zip packages_apps_Settings-cd88c2f7c30fe58e523e93469dd1fc7a121320f3.tar.gz packages_apps_Settings-cd88c2f7c30fe58e523e93469dd1fc7a121320f3.tar.bz2 | |
Fix Account Settings crash
Bug: 17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4
Diffstat (limited to 'src/com/android/settings/accounts')
| -rw-r--r-- | src/com/android/settings/accounts/AccountSettings.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ public class AccountSettings extends SettingsPreferenceFragment 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 @@ public class AccountSettings extends SettingsPreferenceFragment .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"); } } |