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

Commit 889892cd authored by Peter Wang's avatar Peter Wang Committed by Automerger Merge Worker
Browse files

Merge "Restrict access to the resolution PendingIntent created by... 

Merge "Restrict access to the resolution PendingIntent created by EuiccController to EuiccResolutionUiDispatcherActivity" into rvc-dev am: ed4731a7 am: 8c59c511

Change-Id: I243b47df9b98c3aacbf557e125398e874cd08d2c
parents da3e7f9e 8c59c511

src/java/com/android/internal/telephony/euicc/EuiccController.java

+9 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.app.AppOpsManager;

import android.app.PendingIntent;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ComponentInfo;
@@ -81,6 +82,11 @@ public class EuiccController extends IEuiccController.Stub { 
    private static final String EXTRA_EMBEDDED_SUBSCRIPTION_DOWNLOADABLE_SUBSCRIPTION =

            EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_DOWNLOADABLE_SUBSCRIPTION;



    /** Restrictions limiting access to the PendingIntent */

    private static final String RESOLUTION_ACTIVITY_PACKAGE_NAME = "com.android.phone";

    private static final String RESOLUTION_ACTIVITY_CLASS_NAME =

            "com.android.phone.euicc.EuiccResolutionUiDispatcherActivity";



    private static EuiccController sInstance;



    private final Context mContext;
@@ -1258,6 +1264,9 @@ public class EuiccController extends IEuiccController.Stub { 
            String callingPackage, int resolvableErrors, boolean confirmationCodeRetried,

            EuiccOperation op, int cardId) {

        Intent intent = new Intent(EuiccManager.ACTION_RESOLVE_ERROR);

        intent.setPackage(RESOLUTION_ACTIVITY_PACKAGE_NAME);

        intent.setComponent(new ComponentName(

                        RESOLUTION_ACTIVITY_PACKAGE_NAME, RESOLUTION_ACTIVITY_CLASS_NAME));

        intent.putExtra(EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_RESOLUTION_ACTION,

                resolutionAction);

        intent.putExtra(EuiccService.EXTRA_RESOLUTION_CALLING_PACKAGE, callingPackage);