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

Merge "[MEP] Handle downloadSubscription with switchAfterDownload is set to true" into tm-dev am: c3bc12ad77

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17004326

Change-Id: I8c3e035ecef7a455c34d3a44b9850c782eebdbc5
This commit is contained in:
Muralidhar Reddy Mule
2022-02-28 05:04:24 +00:00
committed by Automerger Merge Worker
parent cac8e13dc7 c3bc12ad77
commit c049e25720
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
telephony/java/android/service/euicc/EuiccService.java
View File

@@ -29,7 +29,6 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.telephony.TelephonyManager;
import android.telephony.euicc.DownloadableSubscription; import android.telephony.euicc.DownloadableSubscription;
import android.telephony.euicc.EuiccInfo; import android.telephony.euicc.EuiccInfo;
import android.telephony.euicc.EuiccManager; import android.telephony.euicc.EuiccManager;
@@ -744,18 +743,16 @@ public abstract class EuiccService extends Service {
public void run() { public void run() {
DownloadSubscriptionResult result; DownloadSubscriptionResult result;
try { try {
result = result = EuiccService.this.onDownloadSubscription(
EuiccService.this.onDownloadSubscription( slotId, portIndex, subscription, switchAfterDownload,
slotId, subscription, switchAfterDownload, forceDeactivateSim, forceDeactivateSim, resolvedBundle);
resolvedBundle);
} catch (AbstractMethodError e) { } catch (AbstractMethodError e) {
Log.w(TAG, "The new onDownloadSubscription(int, " Log.w(TAG, "The new onDownloadSubscription(int, int, "
+ "DownloadableSubscription, boolean, boolean, Bundle) is not " + "DownloadableSubscription, boolean, boolean, Bundle) is not "
+ "implemented. Fall back to the old one.", e); + "implemented. Fall back to the old one.", e);
int resultCode = EuiccService.this.onDownloadSubscription( result = EuiccService.this.onDownloadSubscription(
slotId, subscription, switchAfterDownload, forceDeactivateSim); slotId, subscription, switchAfterDownload,
result = new DownloadSubscriptionResult(resultCode, forceDeactivateSim, resolvedBundle);
0 /* resolvableErrors */, TelephonyManager.UNSUPPORTED_CARD_ID);
} }
try { try {
callback.onComplete(result); callback.onComplete(result);