Merge "Fix ANR in SystemUI due to race condition." into tm-qpr-dev (cc0ae10b) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -865,6 +865,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
		@@ -979,11 +984,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() {

+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()));