commit ce4969c58edb320c341c3db56b50eec2a0a1052a
author Eric Arseneau <earseneau@google.com> Wed Aug 05 10:49:47 2020 -0700
committer Eric Arseneau <earseneau@google.com> Wed Aug 05 10:49:47 2020 -0700
tree 574294f87d2563f1632e849834e913f0ab77bda6
parent c8f3044df8d3b1d49a6fafa83283911b2cd04881
parent 79f22d2b4d44d1eabb5a986f7a893f6be5dfcc62

Merge spl-2020-08-05

Change-Id: Ia7cf8b053673069985f34df2328bc4d528f9405c

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) {