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

Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev am: 19272a236b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920154

Change-Id: Ib2ff7379d848bc65c925f588ef6d6d700a0d9549
This commit is contained in:
TreeHugger Robot
2020-06-18 22:35:47 +00:00
committed by Automerger Merge Worker
parent bfaa2fed21 19272a236b
commit e98bf81d60
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,6 +222,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
try { try {
Set<Association> associations = readAllAssociations(userId); Set<Association> associations = readAllAssociations(userId);
if (associations == null) {
continue;
}
for (Association a : associations) { for (Association a : associations) {
try { try {
int uid = pm.getPackageUidAsUser(a.companionAppPackage, userId); int uid = pm.getPackageUidAsUser(a.companionAppPackage, userId);