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

Merge QQ3A.200805.001

Browse Source 
Bug: 162879794
Merged-In: I398e0d1f652bafc92f99b05d665cf1f9018cc6fa
Change-Id: I1129dba865eb6acaa047bc43e3057d02d8528ff0
This commit is contained in:
Xin Li
2020-08-04 15:30:39 -07:00
parent 9057a78bfa 79f22d2b4d
commit d2b2a4e126
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/accounts/AccountTypePreferenceLoader.java
View File

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