Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32458607 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Do not unregister keyguardupdatemonitor" into udc-qpr-dev am: 453f0bd8 

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



Change-Id: I7863dc41541b4b24ade064312dc3f7e063755c61
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24d6b6a9 453f0bd8

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

+3 −2
Original line number Diff line number Diff line
@@ -209,6 +209,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);

                });

            }

        });

    }
@@ -276,7 +279,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);
@@ -289,7 +291,6 @@ public class CarrierTextManager { 
        } else {

            mCarrierTextCallback = null;

            mMainExecutor.execute(() -> {

                mKeyguardUpdateMonitor.removeCallback(mCallback);

                mWakefulnessLifecycle.removeObserver(mWakefulnessObserver);

            });

            mTelephonyListenerManager.removeActiveDataSubscriptionIdListener(mPhoneStateListener);

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

+1 −0
Original line number Diff line number Diff line
@@ -3313,6 +3313,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) {