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

am 4b81ebf2: am cd88c2f7: Fix Account Settings crash

Browse Source 
* commit '4b81ebf28557b8ed61ecdce96fcdef30c851ca4d':
  Fix Account Settings crash
This commit is contained in:
Alexandra Gherghina
2014-08-18 16:44:28 +00:00
committed by Android Git Automerger
parent 1169cd85d2 4b81ebf285
commit 13e00185b8
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())); currentProfile.getIdentifier()));
menu.findItem(R.id.account_settings_menu_auto_sync_personal).setVisible(false); menu.findItem(R.id.account_settings_menu_auto_sync_personal).setVisible(false);
menu.findItem(R.id.account_settings_menu_auto_sync_work).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 // We assume there's only one managed profile, otherwise UI needs to change
final UserHandle managedProfile = mProfiles.valueAt(1).userInfo.getUserHandle(); final UserHandle managedProfile = mProfiles.valueAt(1).userInfo.getUserHandle();
@@ -152,6 +152,8 @@ public class AccountSettings extends SettingsPreferenceFragment
.setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser( .setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser(
managedProfile.getIdentifier())); managedProfile.getIdentifier()));
menu.findItem(R.id.account_settings_menu_auto_sync).setVisible(false); menu.findItem(R.id.account_settings_menu_auto_sync).setVisible(false);
} else {
Log.w(TAG, "Method onPrepareOptionsMenu called before mProfiles was initialized");
} }
} }