Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e98bf81d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ib2ff7379d848bc65c925f588ef6d6d700a0d9549
parents bfaa2fed 19272a23

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -222,6 +222,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 


            try {

                Set<Association> associations = readAllAssociations(userId);

                if (associations == null) {

                    continue;

                }

                for (Association a : associations) {

                    try {

                        int uid = pm.getPackageUidAsUser(a.companionAppPackage, userId);