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

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

Merge "Propagate the right permission information on empty prepare response"... 

Merge "Propagate the right permission information on empty prepare response" into udc-dev am: 17d57e9f am: 0c5b0de9

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



Change-Id: Ie76b888dea23a4937b9c121f5e526816852d1197
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 936bf4f9 0c5b0de9

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

+11 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.Manifest.permission.CREDENTIAL_MANAGER_SET_ORIGIN; 
import static android.content.Context.CREDENTIAL_SERVICE;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;



import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;
@@ -55,6 +56,7 @@ import android.provider.DeviceConfig; 
import android.provider.Settings;

import android.service.credentials.CallingAppInfo;

import android.service.credentials.CredentialProviderInfoFactory;

import android.service.credentials.PermissionUtils;

import android.text.TextUtils;

import android.util.Pair;

import android.util.Slog;
@@ -546,11 +548,16 @@ public final class CredentialManagerService 


            if (providerSessions.isEmpty()) {

                try {

                    // TODO: fix

                    prepareGetCredentialCallback.onResponse(

                            new PrepareGetCredentialResponseInternal(

                                    false, null,

                                    false, false, null));

                            new PrepareGetCredentialResponseInternal(PermissionUtils.hasPermission(

                                    mContext,

                                    callingPackage,

                                    Manifest.permission

                                            .CREDENTIAL_MANAGER_QUERY_CANDIDATE_CREDENTIALS),

                                    /*credentialResultTypes=*/null,

                                    /*hasAuthenticationResults=*/false,

                                    /*hasRemoteResults=*/false,

                                    /*pendingIntent=*/null));

                } catch (RemoteException e) {

                    Slog.e(

                            TAG,