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

Commit 8fa0eac6 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "Make getCredentialManagerPolicy user handle aware" into udc-dev am:... 

Merge "Make getCredentialManagerPolicy user handle aware" into udc-dev am: b545d60e am: b4cb6410

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



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

core/java/android/app/admin/DevicePolicyManager.java

+4 −1
Original line number Diff line number Diff line
@@ -10335,11 +10335,14 @@ public class DevicePolicyManager { 
     * @return the current credential manager policy if null then this policy has not been

     * configured.

     */

    @UserHandleAware(

            enabledSinceTargetSdkVersion = UPSIDE_DOWN_CAKE,

            requiresPermissionIfNotCaller = INTERACT_ACROSS_USERS)

    public @Nullable PackagePolicy getCredentialManagerPolicy() {

        throwIfParentInstance("getCredentialManagerPolicy");

        if (mService != null) {

            try {

                return mService.getCredentialManagerPolicy();

                return mService.getCredentialManagerPolicy(myUserId());

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ interface IDevicePolicyManager { 
    boolean hasManagedProfileCallerIdAccess(int userId, String packageName);



    void setCredentialManagerPolicy(in PackagePolicy policy);

    PackagePolicy getCredentialManagerPolicy();

    PackagePolicy getCredentialManagerPolicy(int userId);



    void setManagedProfileContactsAccessPolicy(in PackagePolicy policy);

    PackagePolicy getManagedProfileContactsAccessPolicy();

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -16651,16 +16651,20 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    }















    @Override













    public PackagePolicy getCredentialManagerPolicy() {













    public PackagePolicy getCredentialManagerPolicy(int userId) {















        if (!mHasFeature) {















            return null;















        }















        final CallerIdentity caller = getCallerIdentity();















        Preconditions.checkCallAuthorization(















                canWriteCredentialManagerPolicy(caller) || canQueryAdminPolicy(caller));













        if (userId != caller.getUserId()) {













            Preconditions.checkCallAuthorization(













                    hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS));













        }





























        synchronized (getLockObject()) {













            ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(caller.getUserId());













            ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(userId);















            return (admin != null) ? admin.mCredentialManagerPolicy : null;















        }















    }