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

Commit 95808a09 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add wakefullness calls on main thread" into sc-v2-dev am: 8eb5097e am: 5e1d0717 

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

Change-Id: I39e440ae0f52c0ab894681cb017cf8e0b4792f56
parents 3258c75a 5e1d0717

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

+8 −4
Original line number Diff line number Diff line
@@ -261,8 +261,10 @@ public class CarrierTextManager { 
            mCarrierTextCallback = callback;

            if (mNetworkSupported.get()) {

                // Keyguard update monitor expects callbacks from main thread

                mMainExecutor.execute(() -> mKeyguardUpdateMonitor.registerCallback(mCallback));

                mMainExecutor.execute(() -> {

                    mKeyguardUpdateMonitor.registerCallback(mCallback);

                    mWakefulnessLifecycle.addObserver(mWakefulnessObserver);

                });

                mTelephonyListenerManager.addActiveDataSubscriptionIdListener(mPhoneStateListener);

            } else {

                // Don't listen and clear out the text when the device isn't a phone.
@@ -272,8 +274,10 @@ public class CarrierTextManager { 
            }

        } else {

            mCarrierTextCallback = null;

            mMainExecutor.execute(() -> mKeyguardUpdateMonitor.removeCallback(mCallback));

            mMainExecutor.execute(() -> {

                mKeyguardUpdateMonitor.removeCallback(mCallback);

                mWakefulnessLifecycle.removeObserver(mWakefulnessObserver);

            });

            mTelephonyListenerManager.removeActiveDataSubscriptionIdListener(mPhoneStateListener);

        }

    }