Merge "Fix NPE in CDM UI" into sc-dev (f341c5ab) · Commits · e / os / android_frameworks_base

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}