Merge "Use the correct userId when checking if disabled by admin." (91e0ba7d) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ChooseLockGeneric.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -417,7 +417,7 @@ public class ChooseLockGeneric extends SettingsActivity {

		int adminEnforcedQuality = mDPM.getPasswordQuality(null);
		EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
		getActivity());
		getActivity(), mUserId);
		for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
		Preference pref = entries.getPreference(i);
		if (pref instanceof RestrictedPreference) {

src/com/android/settings/accessibility/AccessibilitySettings.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -482,8 +482,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
		boolean serviceAllowed =
		permittedServices == null \|\| permittedServices.contains(packageName);
		if (!serviceAllowed && !serviceEnabled) {
		EnforcedAdmin admin =
		RestrictedLockUtils.getProfileOrDeviceOwnerOnCallingUser(getActivity());
		EnforcedAdmin admin = RestrictedLockUtils.checkIfAccessibilityServiceDisallowed(
		getActivity(), serviceInfo.packageName, UserHandle.myUserId());
		if (admin != null) {
		preference.setDisabledByAdmin(admin);
		} else {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -272,7 +272,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
		mUserHandle.getIdentifier());
		if (admin == null) {
		admin = RestrictedLockUtils.checkIfAccountManagementDisabled(
		getPrefContext(), mAccount.type);
		getPrefContext(), mAccount.type, mUserHandle.getIdentifier());
		}
		RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),
		removeAccount, admin);

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -34,11 +34,14 @@ import android.widget.Toast;

		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settingslib.RestrictedLockUtils;

		import java.io.IOException;

		import static android.content.Intent.EXTRA_USER;

		import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

		/**
		* Entry point Activity for account setup. Works as follows
		*
		@@ -171,6 +174,9 @@ public class AddAccountSettings extends Activity {
		switch (requestCode) {
		case CHOOSE_ACCOUNT_REQUEST:
		if (resultCode == RESULT_CANCELED) {
		if (data != null) {
		startActivityAsUser(data, mUserHandle);
		}
		setResult(resultCode);
		finish();
		return;

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

+16 −3

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import com.android.internal.util.CharSequences;
		import com.android.settings.InstrumentedPreferenceActivity;
		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settingslib.RestrictedLockUtils;

		import java.util.ArrayList;
		import java.util.Collections;
		@@ -48,6 +49,8 @@ import java.util.Map;

		import static android.content.Intent.EXTRA_USER;

		import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

		/**
		* Activity asking a user to select an account to be set up.
		*
		@@ -160,9 +163,19 @@ public class ChooseAccountActivity extends InstrumentedPreferenceActivity {
		}
		}

		final Context context = getPreferenceScreen().getContext();
		if (mProviderList.size() == 1) {
		// If there's only one provider that matches, just run it.
		// There's only one provider that matches. If it is disabled by admin show the
		// support dialog otherwise run it.
		EnforcedAdmin admin = RestrictedLockUtils.checkIfAccountManagementDisabled(
		context, mProviderList.get(0).type, mUserHandle.getIdentifier());
		if (admin != null) {
		setResult(RESULT_CANCELED, RestrictedLockUtils.getShowAdminSupportDetailsIntent(
		context, admin));
		finish();
		} else {
		finishWithAccountType(mProviderList.get(0).type);
		}
		} else if (mProviderList.size() > 0) {
		Collections.sort(mProviderList);
		mAddAccountGroup.removeAll();
		@@ -170,7 +183,7 @@ public class ChooseAccountActivity extends InstrumentedPreferenceActivity {
		Drawable drawable = getDrawableForType(pref.type);
		ProviderPreference p = new ProviderPreference(getPreferenceScreen().getContext(),
		pref.type, drawable, pref.name);
		p.checkAccountManagementAndSetDisabled();
		p.checkAccountManagementAndSetDisabled(mUserHandle.getIdentifier());
		mAddAccountGroup.addPreference(p);
		}
		} else {