PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: 156ea15bb2 am: a3409e66df am: 1e79e1d398

Browse Source 
Change-Id: I2dde3ff7933a9aa466598e58d9ef2d628cefc250
This commit is contained in:
Bonian Chen
2020-05-07 09:03:09 +00:00
committed by Automerger Merge Worker
parent a6c8e5250d 1e79e1d398
commit 5d856c1cfd
2 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -61,9 +61,11 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
public class SimStatusDialogController implements LifecycleObserver, OnResume, OnPause {
@@ -218,7 +220,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
}
public void initialize() {
updateEid();
requestForUpdateEid();
if (mSubscriptionInfo == null) {
return;
@@ -560,25 +562,33 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
}
}
private void updateEid() {
@VisibleForTesting
void requestForUpdateEid() {
ThreadUtils.postOnBackgroundThread(() -> {
final AtomicReference<String> eid = getEid(mSlotIndex);
ThreadUtils.postOnMainThread(() -> updateEid(eid));
});
}
@VisibleForTesting
AtomicReference<String> getEid(int slotIndex) {
boolean shouldHaveEid = false;
String eid = null;
if (mTelephonyManager.getActiveModemCount() > MAX_PHONE_COUNT_SINGLE_SIM) {
// Get EID per-SIM in multi-SIM mode
Map<Integer, Integer> mapping = mTelephonyManager.getLogicalToPhysicalSlotMapping();
int pSlotId = mapping.getOrDefault(mSlotIndex,
final Map<Integer, Integer> mapping = mTelephonyManager
.getLogicalToPhysicalSlotMapping();
final int pSlotId = mapping.getOrDefault(slotIndex,
SubscriptionManager.INVALID_SIM_SLOT_INDEX);
if (pSlotId != SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
List<UiccCardInfo> infos = mTelephonyManager.getUiccCardsInfo();
final List<UiccCardInfo> infos = mTelephonyManager.getUiccCardsInfo();
for (UiccCardInfo info : infos) {
if (info.getSlotIndex() == pSlotId) {
if (info.isEuicc()) {
shouldHaveEid = true;
eid = info.getEid();
if (TextUtils.isEmpty(eid)) {
eid = mEuiccManager.createForCardId(info.getCardId()).getEid();
}
@@ -592,12 +602,19 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
shouldHaveEid = true;
eid = mEuiccManager.getEid();
}
if ((!shouldHaveEid) && (eid == null)) {
return null;
}
return new AtomicReference<String>(eid);
}
if (!shouldHaveEid) {
@VisibleForTesting
void updateEid(AtomicReference<String> eid) {
if (eid == null) {
mDialog.removeSettingFromScreen(EID_INFO_LABEL_ID);
mDialog.removeSettingFromScreen(EID_INFO_VALUE_ID);
} else if (!TextUtils.isEmpty(eid)) {
mDialog.setText(EID_INFO_VALUE_ID, eid);
} else if (eid.get() != null) {
mDialog.setText(EID_INFO_VALUE_ID, eid.get());
}
}