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

Commit 7ab4a7f6 authored by Rahul Banerjee's avatar Rahul Banerjee Committed by Automerger Merge Worker
Browse files

Merge "Fix ANR in SystemUI due to race condition." into tm-qpr-dev am: cc0ae10b am: 8de33004 

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



Change-Id: I0a3295f96175603cb2d5714cec2e85c0858ff77c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d6ab7bd 8de33004

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+5 −5
Original line number Diff line number Diff line
@@ -867,6 +867,11 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        wiredChargingRippleController.registerCallbacks();



        mLightRevealScrimViewModelLazy = lightRevealScrimViewModelLazy;



        // Based on teamfood flag, turn predictive back dispatch on at runtime.

        if (mFeatureFlags.isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_SYSUI)) {

            mContext.getApplicationInfo().setEnableOnBackInvokedCallback(true);

        }

    }



    @Override
@@ -981,11 +986,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        // Lastly, call to the icon policy to install/update all the icons.

        mIconPolicy.init();



        // Based on teamfood flag, turn predictive back dispatch on at runtime.

        if (mFeatureFlags.isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_SYSUI)) {

            mContext.getApplicationInfo().setEnableOnBackInvokedCallback(true);

        }



        mKeyguardStateController.addCallback(new KeyguardStateController.Callback() {

            @Override

            public void onUnlockedChanged() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+4 −0
Original line number Diff line number Diff line
@@ -321,6 +321,10 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
    public void setup() throws Exception {

        MockitoAnnotations.initMocks(this);



        // CentralSurfacesImpl's runtime flag check fails if the flag is absent.

        // This value is unused, because test manifest is opted in.

        mFeatureFlags.set(Flags.WM_ENABLE_PREDICTIVE_BACK_SYSUI, false);



        IThermalService thermalService = mock(IThermalService.class);

        mPowerManager = new PowerManager(mContext, mPowerManagerService, thermalService,

                Handler.createAsync(Looper.myLooper()));