Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat (b10a5b0d) · Commits · e / os / android_packages_apps_Settings

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

+1 −8

Original line number	Diff line number	Diff line
		@@ -534,14 +534,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
		ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo;
		ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;
		try {
		if (resolvedActivityInfo.exported) {
		if (resolvedActivityInfo.permission == null) {
		return true; // exported activity without permission.
		} else if (pm.checkPermission(resolvedActivityInfo.permission,
		authDesc.packageName) == PackageManager.PERMISSION_GRANTED) {
		return true;
		}
		}
		// Allows to launch only authenticator owned activities.
		ApplicationInfo authenticatorAppInf = pm.getApplicationInfo(authDesc.packageName, 0);
		return resolvedAppInfo.uid == authenticatorAppInf.uid;
		} catch (NameNotFoundException e) {