From 670b0d58f7976676a2e762903210d4be96f670d0 Mon Sep 17 00:00:00 2001
From: Michal Karpinski <mkarpinski@google.com>
Date: Wed, 10 Apr 2019 10:44:48 +0100
Subject: [PATCH] Fix NPE in CompanionDeviceManagerService#unlockUser()

Test: manual
Bug: 130221860
Change-Id: I77f59d3b60fb79fc3b975449903ad28b5b7893e2
---
 .../server/companion/CompanionDeviceManagerService.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index a3e7d36851001..54a3ecb226872 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -166,6 +166,9 @@ public void onStart() {
     @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);