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

Fix flaky sysui crash in devicehealthchecks test.

Browse Source 
Upgrade tuner on the main thread to avoid
ConcurrentModificationException.

Fixes: 133847620
Test: mp droid
Change-Id: I15ef66a19eeac2c6baf652d83e6a90669834f203
This commit is contained in:
Amin Shaikh
2019-07-02 09:45:58 -04:00
parent 6f3ca53561
commit 4197a29b68
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java
View File

@@ -15,7 +15,7 @@
*/ */
package com.android.systemui.tuner; 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.app.ActivityManager;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -82,7 +82,7 @@ public class TunerServiceImpl extends TunerService {
/** /**
*/ */
@Inject @Inject
public TunerServiceImpl(Context context, @Named(BG_HANDLER_NAME) Handler bgHandler, public TunerServiceImpl(Context context, @Named(MAIN_HANDLER_NAME) Handler mainHandler,
LeakDetector leakDetector) { LeakDetector leakDetector) {
mContext = context; mContext = context;
mContentResolver = mContext.getContentResolver(); mContentResolver = mContext.getContentResolver();
@@ -91,7 +91,7 @@ public class TunerServiceImpl extends TunerService {
for (UserInfo user : UserManager.get(mContext).getUsers()) { for (UserInfo user : UserManager.get(mContext).getUsers()) {
mCurrentUser = user.getUserHandle().getIdentifier(); mCurrentUser = user.getUserHandle().getIdentifier();
if (getValue(TUNER_VERSION, 0) != CURRENT_TUNER_VERSION) { 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(); mUserTracker.stopTracking();
} }
private void upgradeTuner(int oldVersion, int newVersion, Handler bgHandler) { private void upgradeTuner(int oldVersion, int newVersion, Handler mainHandler) {
if (oldVersion < 1) { if (oldVersion < 1) {
String blacklistStr = getValue(StatusBarIconController.ICON_BLACKLIST); String blacklistStr = getValue(StatusBarIconController.ICON_BLACKLIST);
if (blacklistStr != null) { if (blacklistStr != null) {
@@ -134,7 +134,7 @@ public class TunerServiceImpl extends TunerService {
if (oldVersion < 4) { if (oldVersion < 4) {
// Delay this so that we can wait for everything to be registered first. // Delay this so that we can wait for everything to be registered first.
final int user = mCurrentUser; final int user = mCurrentUser;
bgHandler.postDelayed( mainHandler.postDelayed(
() -> clearAllFromUser(user), 5000); () -> clearAllFromUser(user), 5000);
} }
setValue(TUNER_VERSION, newVersion); setValue(TUNER_VERSION, newVersion);