Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c049e257 authored by Muralidhar Reddy Mule's avatar Muralidhar Reddy Mule Committed by Automerger Merge Worker
Browse files

Merge "[MEP] Handle downloadSubscription with switchAfterDownload is set to... 

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

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

Change-Id: I8c3e035ecef7a455c34d3a44b9850c782eebdbc5
parents cac8e13d c3bc12ad

telephony/java/android/service/euicc/EuiccService.java

+7 −10
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.content.Intent; 
import android.os.Bundle;

import android.os.IBinder;

import android.os.RemoteException;

import android.telephony.TelephonyManager;

import android.telephony.euicc.DownloadableSubscription;

import android.telephony.euicc.EuiccInfo;

import android.telephony.euicc.EuiccManager;
@@ -744,18 +743,16 @@ public abstract class EuiccService extends Service { 
                public void run() {

                    DownloadSubscriptionResult result;

                    try {

                        result =

                            EuiccService.this.onDownloadSubscription(

                                slotId, subscription, switchAfterDownload, forceDeactivateSim,

                                resolvedBundle);

                        result = EuiccService.this.onDownloadSubscription(

                                slotId, portIndex, subscription, switchAfterDownload,

                                forceDeactivateSim, resolvedBundle);

                    } catch (AbstractMethodError e) {

                        Log.w(TAG, "The new onDownloadSubscription(int, "

                        Log.w(TAG, "The new onDownloadSubscription(int, int, "

                                + "DownloadableSubscription, boolean, boolean, Bundle) is not "

                                + "implemented. Fall back to the old one.", e);

                        int resultCode = EuiccService.this.onDownloadSubscription(

                                slotId, subscription, switchAfterDownload, forceDeactivateSim);

                        result = new DownloadSubscriptionResult(resultCode,

                            0 /* resolvableErrors */, TelephonyManager.UNSUPPORTED_CARD_ID);

                        result = EuiccService.this.onDownloadSubscription(

                                slotId, subscription, switchAfterDownload,

                                forceDeactivateSim, resolvedBundle);

                    }

                    try {

                        callback.onComplete(result);