From 800631affd5eaae69855f2a0c1ba24d1e4f3acbc Mon Sep 17 00:00:00 2001 From: Jay Civelli Date: Thu, 19 Jun 2014 08:32:18 -0700 Subject: [PATCH] Reenabling permission check for TrustAgent. Now that master is using Manchego, the permission check for TrustAgent can be reenabled. Change-Id: I3c05a97de965684bef460ab3e3289657f9542af3 --- .../java/com/android/server/trust/TrustManagerService.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index b9ef492355758..32546df998e34 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -186,16 +186,12 @@ 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;