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

[MEP]Uncomment the EuiccManager switchToSubscription changes.

Browse Source 
Currently targetSdk enforcement inside switchToSubscription
(without port) API is commented as apps such as tycho and CBRS
are not yet adopted to the new Android T APIs.

Test: Manually tested esim scenarios and atest executed
Bug: 221887933
Merged-In: I8faf9cf58db7c9204193643d4fa710d6d6608d55
Change-Id: I7b1897df2ff350ef43617c3ede140ef4beb83165
This commit is contained in:
Shivakumar Neginal
2022-05-13 07:36:59 +00:00
parent 65f8aea175
commit b9d34ecb2f
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
telephony/java/android/telephony/euicc/EuiccManager.java
View File

@@ -25,18 +25,17 @@ import android.annotation.SdkConstant;
import android.annotation.SystemApi;
import android.app.Activity;
import android.app.PendingIntent;
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledSince;
import android.content.Context;
import android.content.Intent;
import android.content.IntentSender;
import android.content.pm.PackageManager;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
import android.os.RemoteException;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyFrameworkInitializer;
import android.telephony.TelephonyManager;
import android.telephony.UiccCardInfo;
@@ -1209,18 +1208,16 @@ public class EuiccManager {
return;
}
try {
// TODO: Uncomment below compat change code once callers are ported to use
// switchToSubscription with portIndex for disable operation.
// if (subscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID
// && getIEuiccController().isCompatChangeEnabled(mContext.getOpPackageName(),
// SWITCH_WITHOUT_PORT_INDEX_EXCEPTION_ON_DISABLE)) {
// // Apps targeting on Android T and beyond will get exception whenever
// // switchToSubscription without portIndex is called with INVALID_SUBSCRIPTION_ID.
// Log.e(TAG, "switchToSubscription without portIndex is not allowed for"
// + " disable operation");
// throw new IllegalArgumentException("Must use switchToSubscription with portIndex"
// + " API for disable operation");
// }
if (subscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID
&& getIEuiccController().isCompatChangeEnabled(mContext.getOpPackageName(),
SWITCH_WITHOUT_PORT_INDEX_EXCEPTION_ON_DISABLE)) {
// Apps targeting on Android T and beyond will get exception whenever
// switchToSubscription without portIndex is called with INVALID_SUBSCRIPTION_ID.
Log.e(TAG, "switchToSubscription without portIndex is not allowed for"
+ " disable operation");
throw new IllegalArgumentException("Must use switchToSubscription with portIndex"
+ " API for disable operation");
}
getIEuiccController().switchToSubscription(mCardId,
subscriptionId, mContext.getOpPackageName(), callbackIntent);
} catch (RemoteException e) {