commit dfb3f561eaf553204912055873d578ce4d255dff
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 13 05:26:25 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 13 05:26:25 2020 +0000
tree e4b6dd6fecec326b14c0b9d67f857fc39a6c6cb1
parent 6d2ad68e1a54353d6efd4799a5856734d45bfa66
parent d6d8f988449617d757a5d7439314198d10d6ee78

Merge "Allows to launch only authenticator owned activities" into rvc-dev

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

diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
index d32b630..c639d1d 100644
--- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
+++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
@@ -197,14 +197,7 @@
         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) {