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

am cd88c2f7: Fix Account Settings crash

Browse Source 
* commit 'cd88c2f7c30fe58e523e93469dd1fc7a121320f3':
  Fix Account Settings crash
This commit is contained in:
Alexandra Gherghina
2014-08-18 16:39:54 +00:00
committed by Android Git Automerger
parent 1f4e0347b9 cd88c2f7c3
commit 4b81ebf285
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/accounts/AccountSettings.java
View File

@@ -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");
}
}