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

Commit 5526fa1c authored by Jeff Davidson's avatar Jeff Davidson Committed by android-build-merger
Browse files

Merge "Pass calling package to resolution UI." into oc-dr1-dev am: 776220d0 

am: f60773b2

Change-Id: I4d21f823af658701f7ffda1671d22eeee761cb57
parents 28da658d f60773b2

core/java/android/service/euicc/EuiccService.java

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,10 @@ public abstract class EuiccService extends Service { 
    public static final String ACTION_RESOLVE_NO_PRIVILEGES =

            "android.service.euicc.action.RESOLVE_NO_PRIVILEGES";



    /** Intent extra set for resolution requests containing the package name of the calling app. */

    public static final String EXTRA_RESOLUTION_CALLING_PACKAGE =

            "android.service.euicc.extra.RESOLUTION_CALLING_PACKAGE";



    /** Result code for a successful operation. */

    public static final int RESULT_OK = 0;

    /** Result code indicating that an active SIM must be deactivated to perform the operation. */

telephony/java/android/telephony/euicc/EuiccManager.java

+4 −2
Original line number Diff line number Diff line
@@ -320,7 +320,8 @@ public class EuiccManager { 
            return;

        }

        try {

            mController.getDownloadableSubscriptionMetadata(subscription, callbackIntent);

            mController.getDownloadableSubscriptionMetadata(

                    subscription, mContext.getOpPackageName(), callbackIntent);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -349,7 +350,8 @@ public class EuiccManager { 
            return;

        }

        try {

            mController.getDefaultDownloadableSubscriptionList(callbackIntent);

            mController.getDefaultDownloadableSubscriptionList(

                    mContext.getOpPackageName(), callbackIntent);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl

+3 −2
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ import android.telephony.euicc.EuiccInfo; 
interface IEuiccController {

    oneway void continueOperation(in Intent resolutionIntent, in Bundle resolutionExtras);

    oneway void getDownloadableSubscriptionMetadata(in DownloadableSubscription subscription,

        in PendingIntent callbackIntent);

    oneway void getDefaultDownloadableSubscriptionList(in PendingIntent callbackIntent);

        String callingPackage, in PendingIntent callbackIntent);

    oneway void getDefaultDownloadableSubscriptionList(

        String callingPackage, in PendingIntent callbackIntent);

    String getEid();

    oneway void downloadSubscription(in DownloadableSubscription subscription,

        boolean switchAfterDownload, String callingPackage, in PendingIntent callbackIntent);