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

Commit 527f826a authored by Shaquille Johnson's avatar Shaquille Johnson Committed by Automerger Merge Worker
Browse files

Merge "Raise an error when unable to get Attestation Application ID" into main am: f32f6b06 

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



Change-Id: I5ea186948b3c76c38336f43f2e07db7332aab3f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e24874fe f32f6b06

keystore/aaid/aidl/android/security/keystore/IKeyAttestationApplicationIdProvider.aidl

+6 −0
Original line number Original line Diff line number Diff line
@@ -20,8 +20,14 @@ import android.security.keystore.KeyAttestationApplicationId; 




/** @hide */

/** @hide */

interface IKeyAttestationApplicationIdProvider {

interface IKeyAttestationApplicationIdProvider {

    const int ERROR_GET_ATTESTATION_APPLICATION_ID_FAILED = 1;



    /**

    /**

     * Provides information describing the possible applications identified by a UID.

     * Provides information describing the possible applications identified by a UID.

     *

     * In case of not getting package ids from uid return

     * {@link #ERROR_GET_ATTESTATION_APPLICATION_ID_FAILED} to the caller.

     *

     * @hide

     * @hide

     */

     */

    KeyAttestationApplicationId getKeyAttestationApplicationId(int uid);

    KeyAttestationApplicationId getKeyAttestationApplicationId(int uid);

services/core/java/com/android/server/security/KeyAttestationApplicationIdProviderService.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */







package com.android.server.security;

package com.android.server.security;





import android.content.Context;

import android.content.Context;
@@ -23,6 +22,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManager.NameNotFoundException;

import android.os.Binder;

import android.os.Binder;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.os.UserHandle;

import android.os.UserHandle;

import android.security.keystore.IKeyAttestationApplicationIdProvider;

import android.security.keystore.IKeyAttestationApplicationIdProvider;

import android.security.keystore.KeyAttestationApplicationId;

import android.security.keystore.KeyAttestationApplicationId;
@@ -57,7 +57,10 @@ public class KeyAttestationApplicationIdProviderService 
        try {

        try {

            String[] packageNames = mPackageManager.getPackagesForUid(uid);

            String[] packageNames = mPackageManager.getPackagesForUid(uid);

            if (packageNames == null) {

            if (packageNames == null) {

                throw new RemoteException("No packages for uid");

                throw new ServiceSpecificException(

                        IKeyAttestationApplicationIdProvider

                                .ERROR_GET_ATTESTATION_APPLICATION_ID_FAILED,

                        "No package for uid: " + uid);

            }

            }

            int userId = UserHandle.getUserId(uid);

            int userId = UserHandle.getUserId(uid);

            keyAttestationPackageInfos = new KeyAttestationPackageInfo[packageNames.length];

            keyAttestationPackageInfos = new KeyAttestationPackageInfo[packageNames.length];