Merge "Add NPE check around live data" into main (c3882af2) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie
		@Override
		protected void onViewDetached() {
		// TODO(b/117344873) Remove below work around after this issue be fixed.
		if (mDisplayId == mDisplayTracker.getDefaultDisplayId()) {
		if (mDisplayId == mDisplayTracker.getDefaultDisplayId() && mLiveData != null) {
		mLiveData.removeObserver(mObserver);
		}
		mConfigurationController.removeCallback(mConfigurationListener);