Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RESTRICT AUTOMERGE

Browse Source 
Fix CDM package check

CDM was using a pckage check that returns a value intead of throwing,
resulting in failing to throw on querying other package's associations

Test: ensure attached bug no longer reproduces
Bug: 167244818
Change-Id: I21319b6f5495dcae681541c76b847aad0c00b8ab
This commit is contained in:
Eugene Susla
2020-10-12 16:23:15 -07:00
committed by Sterling Huber
parent b7eef50878
commit 30b022a8d2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -372,7 +372,10 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
checkArgument(getCallingUserId() == userId, checkArgument(getCallingUserId() == userId,
"Must be called by either same user or system"); "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 @Override