From abc40bbeeb9d8a183b296a7c7ac3a0c55ed8c636 Mon Sep 17 00:00:00 2001 From: Jay Civelli Date: Tue, 10 Jun 2014 16:10:48 -0700 Subject: [PATCH] Temporary removing the Trust Agent permission change. Removing the permission check for Trust Agents, until the GMS core prebuilt has that permission. BUG: 15546358 Change-Id: Id42d3820d8d772b7788ea1f7431944bf13d4cc92 --- .../java/com/android/server/trust/TrustManagerService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index 32546df998e34..b9ef492355758 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -186,12 +186,16 @@ public class TrustManagerService extends SystemService { if (resolveInfo.serviceInfo == null) continue; String packageName = resolveInfo.serviceInfo.packageName; + // STOPSHIP Reenable this check once the GMS Core prebuild library has the + // permission. + /* if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName) != PackageManager.PERMISSION_GRANTED) { Log.w(TAG, "Skipping agent because package " + packageName + " does not have permission " + PERMISSION_PROVIDE_AGENT + "."); continue; } + */ ComponentName name = getComponentName(resolveInfo); if (!enabledAgents.contains(name)) continue;