Merge "Fix NPE in CDM UI" into sc-dev

2021-02-25 23:50:55 +00:00
parent 27b5e90577 18db3f493d
commit f341c5ab4e
1 changed files with 1 additions and 1 deletions
--- 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();
        }
    }