Merge "Do not unregister keyguardupdatemonitor" into udc-qpr-dev (453f0bd8) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -206,6 +206,9 @@ public class CarrierTextManager {
		// This will set/remove the listeners appropriately. Note that it will never double
		// add the listeners.
		handleSetListening(mCarrierTextCallback);
		mainExecutor.execute(() -> {
		mKeyguardUpdateMonitor.registerCallback(mCallback);
		});
		}
		});
		}
		@@ -273,7 +276,6 @@ public class CarrierTextManager {
		if (mNetworkSupported.get()) {
		// Keyguard update monitor expects callbacks from main thread
		mMainExecutor.execute(() -> {
		mKeyguardUpdateMonitor.registerCallback(mCallback);
		mWakefulnessLifecycle.addObserver(mWakefulnessObserver);
		});
		mTelephonyListenerManager.addActiveDataSubscriptionIdListener(mPhoneStateListener);
		@@ -286,7 +288,6 @@ public class CarrierTextManager {
		} else {
		mCarrierTextCallback = null;
		mMainExecutor.execute(() -> {
		mKeyguardUpdateMonitor.removeCallback(mCallback);
		mWakefulnessLifecycle.removeObserver(mWakefulnessObserver);
		});
		mTelephonyListenerManager.removeActiveDataSubscriptionIdListener(mPhoneStateListener);

+1 −0

Original line number	Diff line number	Diff line
		@@ -3810,6 +3810,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab

		becameAbsent \|= ABSENT_SIM_STATE_LIST.contains(state);

		// TODO(b/327476182): Preserve SIM_STATE_CARD_IO_ERROR sims in a separate data source.
		SimData data = mSimDatas.get(subId);
		final boolean changed;
		if (data == null) {