Merge "Fix NPE in CDM UI" into sc-dev am: f341c5ab4e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I718791fa7e6b5c906f89d320a191220782f55a23
This commit is contained in:
Eugene Susla
2021-02-26 00:31:20 +00:00
committed by Automerger Merge Worker

View File

@@ -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();
}
}