Merge "Temporary removing the Trust Agent permission change."

This commit is contained in:
Jay Civelli
2014-06-11 23:00:05 +00:00
committed by Android (Google) Code Review

View File

@@ -43,6 +43,8 @@ public class TrustAgentUtils {
* @return true, if the service in resolveInfo has the permission to provide a trust agent. * @return true, if the service in resolveInfo has the permission to provide a trust agent.
*/ */
public static boolean checkProvidePermission(ResolveInfo resolveInfo, PackageManager pm) { public static boolean checkProvidePermission(ResolveInfo resolveInfo, PackageManager pm) {
// STOPSHIP Reenable this check once the GMS Core prebuild library has the permission.
/*
String packageName = resolveInfo.serviceInfo.packageName; String packageName = resolveInfo.serviceInfo.packageName;
if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName) if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName)
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
@@ -50,6 +52,7 @@ public class TrustAgentUtils {
+ " does not have permission " + PERMISSION_PROVIDE_AGENT + "."); + " does not have permission " + PERMISSION_PROVIDE_AGENT + ".");
return false; return false;
} }
*/
return true; return true;
} }