Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989

Change-Id: I461d82905fd12a886cb1bba9d3517a223edb0b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerng Wang
2023-03-17 17:48:30 +00:00
committed by Automerger Merge Worker

View File

@@ -211,6 +211,7 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
mSwitchPreference.setChecked(isChecked()); mSwitchPreference.setChecked(isChecked());
} }
mRecursiveUpdate.decrementAndGet(); mRecursiveUpdate.decrementAndGet();
updateListenerValue();
dismissProgressBar(); dismissProgressBar();
}); });
}); });
@@ -245,13 +246,13 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
ThreadUtils.postOnBackgroundThread(() -> { ThreadUtils.postOnBackgroundThread(() -> {
queryNetworkSelectionMode(INTERNAL_LOG_TAG_INIT); queryNetworkSelectionMode(INTERNAL_LOG_TAG_INIT);
//Update UI in UI thread //Update UI in UI thread
mUiHandler.post(() -> { mUiHandler.post(() -> {
if (mSwitchPreference != null) { if (mSwitchPreference != null) {
mRecursiveUpdate.getAndIncrement(); mRecursiveUpdate.getAndIncrement();
mSwitchPreference.setChecked(isChecked()); mSwitchPreference.setChecked(isChecked());
mRecursiveUpdate.decrementAndGet(); mRecursiveUpdate.decrementAndGet();
updateListenerValue();
} }
}); });
}); });
@@ -267,7 +268,6 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
private void queryNetworkSelectionMode(String tag) { private void queryNetworkSelectionMode(String tag) {
mCacheOfModeStatus = mTelephonyManager.getNetworkSelectionMode(); mCacheOfModeStatus = mTelephonyManager.getNetworkSelectionMode();
Log.d(LOG_TAG, tag + ": query commend done. mCacheOfModeStatus: " + mCacheOfModeStatus); Log.d(LOG_TAG, tag + ": query commend done. mCacheOfModeStatus: " + mCacheOfModeStatus);
updateListenerValue();
} }
@VisibleForTesting @VisibleForTesting
@@ -284,12 +284,11 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
} }
mCacheOfModeStatus = networkSelectionMode; mCacheOfModeStatus = networkSelectionMode;
Log.d(LOG_TAG, "updateUiAutoSelectValue: mCacheOfModeStatus: " + mCacheOfModeStatus); Log.d(LOG_TAG, "updateUiAutoSelectValue: mCacheOfModeStatus: " + mCacheOfModeStatus);
updateListenerValue();
mRecursiveUpdate.getAndIncrement(); mRecursiveUpdate.getAndIncrement();
updateState(mSwitchPreference); updateState(mSwitchPreference);
mRecursiveUpdate.decrementAndGet(); mRecursiveUpdate.decrementAndGet();
updateListenerValue();
} }
} }