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

Commit e5c307c2 authored by Reema Bajwa's avatar Reema Bajwa Committed by Automerger Merge Worker
Browse files

Merge "Propagate SEET_ALLOWED_PROVIDERS permission to get flow" into udc-dev... 

Merge "Propagate SEET_ALLOWED_PROVIDERS permission to get flow" into udc-dev am: 45af4086 am: 24983805

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



Change-Id: Iea21c767914abd1a70a09bd80386ffe3309441e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4dc2db86 24983805

core/java/android/credentials/ui/RequestInfo.java

+15 −0
Original line number Diff line number Diff line
@@ -113,6 +113,21 @@ public final class RequestInfo implements Parcelable { 
                hasPermissionToOverrideDefault, defaultProviderIds);

    }



    /**

     * Creates new {@code RequestInfo} for a get-credential flow.

     *

     * @hide

     */

    @NonNull

    public static RequestInfo newGetRequestInfo(

            @NonNull IBinder token, @NonNull GetCredentialRequest getCredentialRequest,

            @NonNull String appPackageName, boolean hasPermissionToOverrideDefault) {

        return new RequestInfo(

                token, TYPE_GET, appPackageName, null, getCredentialRequest,

                hasPermissionToOverrideDefault,

                /*defaultProviderIds=*/ new ArrayList<>());

    }



    /** Creates new {@code RequestInfo} for a get-credential flow. */

    @NonNull

    public static RequestInfo newGetRequestInfo(

services/credentials/java/com/android/server/credentials/GetRequestSession.java

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.credentials;



import android.Manifest;

import android.annotation.Nullable;

import android.content.ComponentName;

import android.content.Context;
@@ -30,6 +31,7 @@ import android.credentials.ui.RequestInfo; 
import android.os.CancellationSignal;

import android.os.RemoteException;

import android.service.credentials.CallingAppInfo;

import android.service.credentials.PermissionUtils;

import android.util.Slog;



import com.android.server.credentials.metrics.ProviderSessionMetric;
@@ -101,7 +103,9 @@ public class GetRequestSession extends RequestSession<GetCredentialRequest, 
        try {

            mPendingIntent = mCredentialManagerUi.createPendingIntent(

                    RequestInfo.newGetRequestInfo(

                            mRequestId, mClientRequest, mClientAppInfo.getPackageName()),

                            mRequestId, mClientRequest, mClientAppInfo.getPackageName(),

                            PermissionUtils.hasPermission(mContext, mClientAppInfo.getPackageName(),

                                    Manifest.permission.CREDENTIAL_MANAGER_SET_ALLOWED_PROVIDERS)),

                    providerDataList);

            mClientCallback.onPendingIntent(mPendingIntent);

        } catch (RemoteException e) {

services/credentials/java/com/android/server/credentials/PrepareGetRequestSession.java

+3 −1
Original line number Diff line number Diff line
@@ -189,7 +189,9 @@ public class PrepareGetRequestSession extends GetRequestSession { 
        if (!providerDataList.isEmpty()) {

            return mCredentialManagerUi.createPendingIntent(

                    RequestInfo.newGetRequestInfo(

                            mRequestId, mClientRequest, mClientAppInfo.getPackageName()),

                            mRequestId, mClientRequest, mClientAppInfo.getPackageName(),

                            PermissionUtils.hasPermission(mContext, mClientAppInfo.getPackageName(),

                                    Manifest.permission.CREDENTIAL_MANAGER_SET_ALLOWED_PROVIDERS)),

                    providerDataList);

        } else {

            return null;