Reenabling permission check for TrustAgent.
Now that master is using Manchego, the permission check for TrustAgent can
be reenabled.
Change-Id: I3c05a97de965684bef460ab3e3289657f9542af3
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index b9ef492..32546df 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 @@
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;