Merge "RESTRICT AUTOMERGE Fix CDM package check" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-11-05 20:12:47 +00:00
committed by Android (Google) Code Review

View File

@@ -372,7 +372,10 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
checkArgument(getCallingUserId() == userId,
"Must be called by either same user or system");
mAppOpsManager.checkPackage(Binder.getCallingUid(), pkg);
int callingUid = Binder.getCallingUid();
if (mAppOpsManager.checkPackage(callingUid, pkg) != AppOpsManager.MODE_ALLOWED) {
throw new SecurityException(pkg + " doesn't belong to uid " + callingUid);
}
}
@Override