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

Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS

Browse Source 
Bug: 17188306
Change-Id: I00481c6c4f346b6f4037554296735f4323cbbcfb
This commit is contained in:
Alexandra Gherghina
2014-09-03 14:17:35 +01:00
parent 1e0ea45263
commit af0d9540c2
3 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ import java.util.List;
import static android.content.Intent.EXTRA_USER;
import static android.os.UserManager.DISALLOW_MODIFY_ACCOUNTS;
import static android.provider.Settings.EXTRA_AUTHORITIES;
/**
* Settings screen for the account types on the device.
@@ -83,6 +84,8 @@ public class AccountSettings extends SettingsPreferenceFragment
private ManagedProfileBroadcastReceiver mManagedProfileBroadcastReceiver
= new ManagedProfileBroadcastReceiver();
private Preference mProfileNotAvailablePreference;
private String[] mAuthorities;
private int mAuthoritiesCount = 0;
/**
* Holds data related to the accounts belonging to one profile.
@@ -114,7 +117,10 @@ public class AccountSettings extends SettingsPreferenceFragment
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mUm = (UserManager) getSystemService(Context.USER_SERVICE);
mProfileNotAvailablePreference = new Preference(getActivity());
mAuthorities = getActivity().getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);
if (mAuthorities != null) {
mAuthoritiesCount = mAuthorities.length;
}
setHasOptionsMenu(true);
}
@@ -190,6 +196,7 @@ public class AccountSettings extends SettingsPreferenceFragment
if (preference == profileData.addAccountPreference) {
Intent intent = new Intent(ADD_ACCOUNT_ACTION);
intent.putExtra(EXTRA_USER, profileData.userInfo.getUserHandle());
intent.putExtra(EXTRA_AUTHORITIES, mAuthorities);
startActivity(intent);
return true;
}
@@ -353,6 +360,21 @@ public class AccountSettings extends SettingsPreferenceFragment
for (int i = 0; i < accountTypes.length; i++) {
final String accountType = accountTypes[i];
if (mAuthoritiesCount > 0) {
// Skip showing any account that does not have any of the requested authorities
final ArrayList<String> authoritiesForType = helper.getAuthoritiesForAccountType(
accountType);
boolean show = false;
for (int j = 0; j < mAuthoritiesCount; j++) {
if (authoritiesForType.contains(mAuthorities[j])) {
show = true;
break;
}
}
if (!show) {
continue;
}
}
final CharSequence label = helper.getLabelForType(getActivity(), accountType);
if (label == null) {
continue;