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

[MEP] Use switchToSub API with pending intent

Browse Source 
It is based on the framework refactor. ag/16494924  Framework
changed the API, so here modifies it.

Bug: 205504646
Test: WIP manual
Change-Id: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
Merged-In: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
This commit is contained in:
SongFerngWang
2021-12-23 00:06:03 +08:00
committed by SongFerng Wang
parent eaec059551
commit cd6c83ac8d
1 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.network;
import android.app.FragmentManager; import android.app.FragmentManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Intent;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.UiccCardInfo; import android.telephony.UiccCardInfo;
@@ -106,21 +105,8 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar {
// Use INVALID_SUBSCRIPTION_ID to disable the esim profile. // Use INVALID_SUBSCRIPTION_ID to disable the esim profile.
// The SimSlotMapping is ready, then to execute activate/inactivate esim. // The SimSlotMapping is ready, then to execute activate/inactivate esim.
mIsDuringSimSlotMapping = true; mIsDuringSimSlotMapping = true;
EuiccManager.ResultListener callback = new EuiccManager.ResultListener() {
@Override
public void onComplete(int resultCode, Intent resultIntent) {
Log.i(TAG, String.format("Result code : %d;", resultCode));
if (resultCode == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK) {
mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort,
removedSubInfo);
} else {
setState(State.ERROR, resultCode);
}
}
};
mEuiccManager.switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID, mPort, mEuiccManager.switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID, mPort,
getContext().getMainExecutor(), mCallbackIntent);
callback);
} else { } else {
mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort, removedSubInfo); mSwitchSlotSidecar.runSwitchToEuiccSlot(getTargetSlot(), mPort, removedSubInfo);
} }
@@ -187,19 +173,7 @@ public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar {
private void switchToSubscription() { private void switchToSubscription() {
// The SimSlotMapping is ready, then to execute activate/inactivate esim. // The SimSlotMapping is ready, then to execute activate/inactivate esim.
EuiccManager.ResultListener callback = new EuiccManager.ResultListener() { mEuiccManager.switchToSubscription(mSubId, mPort, mCallbackIntent);
@Override
public void onComplete(int resultCode, Intent resultIntent) {
Log.i(TAG, String.format("Result code : %d;", resultCode));
if (resultCode == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK) {
setState(State.SUCCESS, Substate.UNUSED);
} else {
setState(State.ERROR, resultCode);
}
}
};
mEuiccManager.switchToSubscription(mSubId, mPort, getContext().getMainExecutor(),
callback);
} }
@Override @Override