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

Commit a1a859c0 authored by Michal Karpinski's avatar Michal Karpinski Committed by android-build-merger
Browse files

Merge "Fix NPE in CompanionDeviceManagerService#unlockUser()" into qt-dev 

am: 328cd4c8

Change-Id: I65880ebd9a930f1d6f6d4a956a5ce30ad85ded3a
parents fc653368 328cd4c8

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

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

    public void onUnlockUser(int userHandle) {

        Set<Association> associations = readAllAssociations(userHandle);

        if (associations == null || associations.isEmpty()) {

            return;

        }

        Set<String> companionAppPackages = new HashSet<>();

        for (Association association : associations) {

            companionAppPackages.add(association.companionAppPackage);