From 18db3f493dfe6f349b4af4f09d5c57ee504c88b5 Mon Sep 17 00:00:00 2001
From: Eugene Susla <eugenesusla@google.com>
Date: Thu, 25 Feb 2021 13:35:29 -0800
Subject: [PATCH] Fix NPE in CDM UI

Test: atest CompanionDeviceManagerTest
Change-Id: I19b5a29b0e3d8a048219806810d7e35eae6d767c
---
 .../android/companiondevicemanager/CompanionDeviceActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
index 28072ca4f1137..f1a98adc0ab28 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
@@ -143,7 +143,7 @@ public class CompanionDeviceActivity extends Activity {
     }
 
     static void notifyDevicesChanged() {
-        if (sInstance != null && !sInstance.isFinishing()) {
+        if (sInstance != null && sInstance.mDevicesAdapter != null && !sInstance.isFinishing()) {
             sInstance.mDevicesAdapter.notifyDataSetChanged();
         }
     }