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

Fix sim status details not updated after sim hotswap

Browse Source 
Telephony callback may be removed in onPause during sim hotswap, but they are not re-registered in onResume for sub info still null.

Listen sub info change and re-register telephony callback when need.

Test: function test pass and SimStatusDialogControllerTest unit test pass.

Change-Id: I17e60c9e3441fc593107048494f830408c37ae61
Bug: 384643359
This commit is contained in:
hoffc
2024-12-24 12:52:31 +08:00
parent d16d627a71
commit 39d16d7bfb
2 changed files with 111 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,11 +100,17 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
@VisibleForTesting
static final int MAX_PHONE_COUNT_SINGLE_SIM = 1;
private final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener =
@VisibleForTesting
final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener =
new OnSubscriptionsChangedListener() {
@Override
public void onSubscriptionsChanged() {
SubscriptionInfo oldSubInfo = mSubscriptionInfo;
mSubscriptionInfo = getPhoneSubscriptionInfo(mSlotIndex);
if (getSubId(oldSubInfo) != getSubId(mSubscriptionInfo)) {
unregisterTelephonyCallback(oldSubInfo);
registerTelephonyCallback(mSubscriptionInfo);
}
updateSubscriptionStatus();
}
};
@@ -123,7 +129,6 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
private final Context mContext;
private boolean mShowLatestAreaInfo;
private boolean mIsRegisteredListener = false;
private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
@Override
@@ -137,7 +142,8 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
};
@VisibleForTesting
protected SimStatusDialogTelephonyCallback mTelephonyCallback;
protected final SimStatusDialogTelephonyCallback mTelephonyCallback =
new SimStatusDialogTelephonyCallback();
private CellBroadcastServiceConnection mCellBroadcastServiceConnection;
@@ -181,8 +187,6 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
mContext = dialog.getContext();
mSlotIndex = slotId;
mSubscriptionInfo = getPhoneSubscriptionInfo(slotId);
mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
mEuiccManager = mContext.getSystemService(EuiccManager.class);
mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
@@ -201,11 +205,13 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
public void initialize() {
if (mSubscriptionInfo == null) {
return;
// Should not depend on default sub TelephonyManager, but lots of code already uses it
mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
} else {
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
}
mTelephonyManager =
getTelephonyManager().createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
mTelephonyCallback = new SimStatusDialogTelephonyCallback();
updateLatestAreaInfo();
updateSubscriptionStatus();
}
@@ -222,6 +228,10 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
updateNetworkType();
updateRoamingStatus(serviceState);
updateIccidNumber();
if (mSubscriptionInfo == null) {
updateDataState(TelephonyManager.DATA_UNKNOWN);
}
}
/**
@@ -242,13 +252,9 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
*/
@Override
public void onResume(@NonNull LifecycleOwner owner) {
if (mSubscriptionInfo == null) {
return;
}
mTelephonyManager = getTelephonyManager().createForSubscriptionId(
mSubscriptionInfo.getSubscriptionId());
getTelephonyManager()
.registerTelephonyCallback(mContext.getMainExecutor(), mTelephonyCallback);
// get the latest sub info for it may be updated in onPause/onStop status.
mSubscriptionInfo = getPhoneSubscriptionInfo(mSlotIndex);
registerTelephonyCallback(mSubscriptionInfo);
mSubscriptionManager.addOnSubscriptionsChangedListener(
mContext.getMainExecutor(), mOnSubscriptionsChangedListener);
collectSimStatusDialogInfo(owner);
@@ -259,8 +265,6 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
new IntentFilter(CellBroadcastIntents.ACTION_AREA_INFO_UPDATED),
Context.RECEIVER_EXPORTED/*UNAUDITED*/);
}
mIsRegisteredListener = true;
}
/**
@@ -268,22 +272,9 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
*/
@Override
public void onPause(@NonNull LifecycleOwner owner) {
if (mSubscriptionInfo == null) {
if (mIsRegisteredListener) {
mSubscriptionManager.removeOnSubscriptionsChangedListener(
mOnSubscriptionsChangedListener);
getTelephonyManager().unregisterTelephonyCallback(mTelephonyCallback);
if (mShowLatestAreaInfo) {
mContext.unregisterReceiver(mAreaInfoReceiver);
}
mIsRegisteredListener = false;
}
return;
}
mSubscriptionManager.removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);
getTelephonyManager().unregisterTelephonyCallback(mTelephonyCallback);
mSubscriptionManager.removeOnSubscriptionsChangedListener(
mOnSubscriptionsChangedListener);
unregisterTelephonyCallback(mSubscriptionInfo);
if (mShowLatestAreaInfo) {
mContext.unregisterReceiver(mAreaInfoReceiver);
}
@@ -555,6 +546,34 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
return SubscriptionManager.from(mContext).getActiveSubscriptionInfoForSimSlotIndex(slotId);
}
private void registerTelephonyCallback(SubscriptionInfo subInfo) {
if (subInfo == null) {
return;
}
// No need to have a member to hold mTelephonyManager, leaving it as lots of code
// depending on it
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(subInfo.getSubscriptionId());
mTelephonyManager.registerTelephonyCallback(
mContext.getMainExecutor(), mTelephonyCallback);
}
private void unregisterTelephonyCallback(SubscriptionInfo subInfo) {
if (subInfo == null) {
return;
}
mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(subInfo.getSubscriptionId())
.unregisterTelephonyCallback(mTelephonyCallback);
}
private int getSubId(SubscriptionInfo subInfo) {
return subInfo == null ? SubscriptionManager.INVALID_SUBSCRIPTION_ID :
subInfo.getSubscriptionId();
}
@VisibleForTesting
class SimStatusDialogTelephonyCallback extends TelephonyCallback implements
TelephonyCallback.DataConnectionStateListener,