Merge "Fix flaky sysui crash in devicehealthchecks test." (928c115f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		*/
		package com.android.systemui.tuner;

		import static com.android.systemui.Dependency.BG_HANDLER_NAME;
		import static com.android.systemui.Dependency.MAIN_HANDLER_NAME;

		import android.app.ActivityManager;
		import android.content.ContentResolver;
		@@ -82,7 +82,7 @@ public class TunerServiceImpl extends TunerService {
		/**
		*/
		@Inject
		public TunerServiceImpl(Context context, @Named(BG_HANDLER_NAME) Handler bgHandler,
		public TunerServiceImpl(Context context, @Named(MAIN_HANDLER_NAME) Handler mainHandler,
		LeakDetector leakDetector) {
		mContext = context;
		mContentResolver = mContext.getContentResolver();
		@@ -91,7 +91,7 @@ public class TunerServiceImpl extends TunerService {
		for (UserInfo user : UserManager.get(mContext).getUsers()) {
		mCurrentUser = user.getUserHandle().getIdentifier();
		if (getValue(TUNER_VERSION, 0) != CURRENT_TUNER_VERSION) {
		upgradeTuner(getValue(TUNER_VERSION, 0), CURRENT_TUNER_VERSION, bgHandler);
		upgradeTuner(getValue(TUNER_VERSION, 0), CURRENT_TUNER_VERSION, mainHandler);
		}
		}

		@@ -112,7 +112,7 @@ public class TunerServiceImpl extends TunerService {
		mUserTracker.stopTracking();
		}

		private void upgradeTuner(int oldVersion, int newVersion, Handler bgHandler) {
		private void upgradeTuner(int oldVersion, int newVersion, Handler mainHandler) {
		if (oldVersion < 1) {
		String blacklistStr = getValue(StatusBarIconController.ICON_BLACKLIST);
		if (blacklistStr != null) {
		@@ -134,7 +134,7 @@ public class TunerServiceImpl extends TunerService {
		if (oldVersion < 4) {
		// Delay this so that we can wait for everything to be registered first.
		final int user = mCurrentUser;
		bgHandler.postDelayed(
		mainHandler.postDelayed(
		() -> clearAllFromUser(user), 5000);
		}
		setValue(TUNER_VERSION, newVersion);