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

Commit 5038b6eb 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: b98f3dc9

Change-Id: I16f6445291a4230d64142ff17e6a0f5ea38138b3
parents bf174594 b98f3dc9

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

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,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;
@@ -84,6 +85,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;
@@ -1261,6 +1267,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);