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

Commit a8451c4c authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "DevicePolicy: Make uid parameter an int"

parents 211f8b4d abf3570f

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5404,7 +5404,7 @@ package android.app.admin { 
    ctor public DeviceAdminReceiver();

    method public android.app.admin.DevicePolicyManager getManager(android.content.Context);

    method public android.content.ComponentName getWho(android.content.Context);

    method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, long, java.lang.String, int, java.lang.String, java.lang.String);

    method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, java.lang.String, int, java.lang.String, java.lang.String);

    method public java.lang.CharSequence onDisableRequested(android.content.Context, android.content.Intent);

    method public void onDisabled(android.content.Context, android.content.Intent);

    method public void onEnabled(android.content.Context, android.content.Intent);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5498,7 +5498,7 @@ package android.app.admin { 
    ctor public DeviceAdminReceiver();

    method public android.app.admin.DevicePolicyManager getManager(android.content.Context);

    method public android.content.ComponentName getWho(android.content.Context);

    method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, long, java.lang.String, int, java.lang.String, java.lang.String);

    method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, java.lang.String, int, java.lang.String, java.lang.String);

    method public java.lang.CharSequence onDisableRequested(android.content.Context, android.content.Intent);

    method public void onDisabled(android.content.Context, android.content.Intent);

    method public void onEnabled(android.content.Context, android.content.Intent);

core/java/android/app/admin/DeviceAdminReceiver.java

+2 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
     * @return The private key alias to return and grant access to.

     * @see KeyChain#choosePrivateKeyAlias

     */

    public String onChoosePrivateKeyAlias(Context context, Intent intent, long uid, String host,

    public String onChoosePrivateKeyAlias(Context context, Intent intent, int uid, String host,

            int port, String url, String alias) {

        return null;

    }
@@ -473,7 +473,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
        } else if (ACTION_PROFILE_PROVISIONING_COMPLETE.equals(action)) {

            onProfileProvisioningComplete(context, intent);

        } else if (ACTION_CHOOSE_PRIVATE_KEY_ALIAS.equals(action)) {

            long uid = intent.getLongExtra(EXTRA_CHOOSE_PRIVATE_KEY_SENDER_UID, -1);

            int uid = intent.getIntExtra(EXTRA_CHOOSE_PRIVATE_KEY_SENDER_UID, -1);

            String host = intent.getStringExtra(EXTRA_CHOOSE_PRIVATE_KEY_HOST);

            int port = intent.getIntExtra(EXTRA_CHOOSE_PRIVATE_KEY_PORT, -1);

            String url = intent.getStringExtra(EXTRA_CHOOSE_PRIVATE_KEY_URL);

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

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ interface IDevicePolicyManager { 
    void enforceCanManageCaCerts(in ComponentName admin);



    boolean installKeyPair(in ComponentName who, in byte[] privKeyBuffer, in byte[] certBuffer, String alias);

    void choosePrivateKeyAlias(in String host, int port, in String url, in String alias, IBinder aliasCallback);

    void choosePrivateKeyAlias(int uid, in String host, int port, in String url, in String alias, IBinder aliasCallback);



    void addPersistentPreferredActivity(in ComponentName admin, in IntentFilter filter, in ComponentName activity);

    void clearPackagePersistentPreferredActivities(in ComponentName admin, String packageName);

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

+8 −4
Original line number Diff line number Diff line
@@ -2982,11 +2982,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    }



    @Override

    public void choosePrivateKeyAlias(final String host, int port, final String url,

    public void choosePrivateKeyAlias(final int uid, final String host, int port, final String url,

            final String alias, final IBinder response) {

        final ComponentName profileOwner = getProfileOwner(UserHandle.getCallingUserId());

        // Caller UID needs to be trusted, so we restrict this method to SYSTEM_UID callers.

        if (UserHandle.getAppId(Binder.getCallingUid()) != Process.SYSTEM_UID) {

            return;

        }



        final UserHandle caller = Binder.getCallingUserHandle();

        final int callerUid = Binder.getCallingUid();

        final ComponentName profileOwner = getProfileOwner(caller.getIdentifier());



        if (profileOwner == null) {

            sendPrivateKeyAliasResponse(null, response);
@@ -2995,7 +2999,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


        Intent intent = new Intent(DeviceAdminReceiver.ACTION_CHOOSE_PRIVATE_KEY_ALIAS);

        intent.setComponent(profileOwner);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_SENDER_UID, callerUid);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_SENDER_UID, uid);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_HOST, host);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_PORT, port);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_URL, url);