Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie9f04d5424b18f21a2f9755fb4076f53f5ba7af1
This commit is contained in:
TreeHugger Robot
2021-11-09 15:55:49 +00:00
committed by Automerger Merge Worker
parent 1d1e7a6359 8eb5097e76
commit 5e1d0717e8
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java
View File

@@ -261,8 +261,10 @@ public class CarrierTextManager {
mCarrierTextCallback = callback; mCarrierTextCallback = callback;
if (mNetworkSupported.get()) { if (mNetworkSupported.get()) {
// Keyguard update monitor expects callbacks from main thread // Keyguard update monitor expects callbacks from main thread
mMainExecutor.execute(() -> mKeyguardUpdateMonitor.registerCallback(mCallback)); mMainExecutor.execute(() -> {
mKeyguardUpdateMonitor.registerCallback(mCallback);
mWakefulnessLifecycle.addObserver(mWakefulnessObserver); mWakefulnessLifecycle.addObserver(mWakefulnessObserver);
});
mTelephonyListenerManager.addActiveDataSubscriptionIdListener(mPhoneStateListener); mTelephonyListenerManager.addActiveDataSubscriptionIdListener(mPhoneStateListener);
} else { } else {
// Don't listen and clear out the text when the device isn't a phone. // Don't listen and clear out the text when the device isn't a phone.
@@ -272,8 +274,10 @@ public class CarrierTextManager {
} }
} else { } else {
mCarrierTextCallback = null; mCarrierTextCallback = null;
mMainExecutor.execute(() -> mKeyguardUpdateMonitor.removeCallback(mCallback)); mMainExecutor.execute(() -> {
mKeyguardUpdateMonitor.removeCallback(mCallback);
mWakefulnessLifecycle.removeObserver(mWakefulnessObserver); mWakefulnessLifecycle.removeObserver(mWakefulnessObserver);
});
mTelephonyListenerManager.removeActiveDataSubscriptionIdListener(mPhoneStateListener); mTelephonyListenerManager.removeActiveDataSubscriptionIdListener(mPhoneStateListener);
} }
} }