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

Commit fc291bcb authored by Esteban Talavera's avatar Esteban Talavera
Browse files

Add getBindDeviceAdminTargetUsers API 

Add getBindDeviceAdminTargetUsers API. To be used
for the device or profile owner in a COMP setup to
know the UserHandle of their instance running on
the other profile.

Bug: 31952368,33033966
Test:  cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerPlusManagedProfileTest

Change-Id: I05c9ac0f6c3cdce1ec17cf2910ca7a7214064af2
parent cd367258

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6000,6 +6000,7 @@ package android.app.admin { 
    method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);

    method public java.lang.String getApplicationRestrictionsManagingPackage(android.content.ComponentName);

    method public boolean getAutoTimeRequired();

    method public java.util.List<android.os.UserHandle> getBindDeviceAdminTargetUsers(android.content.ComponentName);

    method public boolean getBluetoothContactSharingDisabled(android.content.ComponentName);

    method public boolean getCameraDisabled(android.content.ComponentName);

    method public java.lang.String getCertInstallerPackage(android.content.ComponentName) throws java.lang.SecurityException;

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6172,6 +6172,7 @@ package android.app.admin { 
    method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);

    method public java.lang.String getApplicationRestrictionsManagingPackage(android.content.ComponentName);

    method public boolean getAutoTimeRequired();

    method public java.util.List<android.os.UserHandle> getBindDeviceAdminTargetUsers(android.content.ComponentName);

    method public boolean getBluetoothContactSharingDisabled(android.content.ComponentName);

    method public boolean getCameraDisabled(android.content.ComponentName);

    method public java.lang.String getCertInstallerPackage(android.content.ComponentName) throws java.lang.SecurityException;

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6016,6 +6016,7 @@ package android.app.admin { 
    method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);

    method public java.lang.String getApplicationRestrictionsManagingPackage(android.content.ComponentName);

    method public boolean getAutoTimeRequired();

    method public java.util.List<android.os.UserHandle> getBindDeviceAdminTargetUsers(android.content.ComponentName);

    method public boolean getBluetoothContactSharingDisabled(android.content.ComponentName);

    method public boolean getCameraDisabled(android.content.ComponentName);

    method public java.lang.String getCertInstallerPackage(android.content.ComponentName) throws java.lang.SecurityException;

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

+33 −3
Original line number Diff line number Diff line
@@ -6715,11 +6715,14 @@ public class DevicePolicyManager { 
    }



    /**

     * Called by device owner/ profile owner in managed profile to bind the service with each other.

     * Called by a device owner to bind to a service from a profile owner of a managed profile or

     * vice versa. See {@link #getBindDeviceAdminTargetUsers} for a definition of which

     * device/profile owners are allowed to bind to services of another profile/device owner.

     * <p>

     * The service must be unexported. Note that the {@link Context} used to obtain this

     * {@link DevicePolicyManager} instance via {@link Context#getSystemService(Class)} will be used

     * to bind to the {@link android.app.Service}.

     * STOPSHIP (b/31952368): Update the javadoc after we policy to control which packages can talk.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param serviceIntent Identifies the service to connect to.  The Intent must specify either an

     *        explicit component name or a package name to match an
@@ -6728,11 +6731,15 @@ public class DevicePolicyManager { 
     *        valid {@link ServiceConnection} object; it must not be {@code null}.

     * @param flags Operation options for the binding operation. See

     *        {@link Context#bindService(Intent, ServiceConnection, int)}.

     * @param targetUser Which user to bind to.

     * @param targetUser Which user to bind to. Must be one of the users returned by

     *        {@link #getBindDeviceAdminTargetUsers}, otherwise a {@link SecurityException} will

     *        be thrown.

     * @return If you have successfully bound to the service, {@code true} is returned;

     *         {@code false} is returned if the connection is not made and you will not

     *         receive the service object.

     *

     * @see Context#bindService(Intent, ServiceConnection, int)

     * @see #getBindDeviceAdminTargetUsers(ComponentName)

     */

    public boolean bindDeviceAdminServiceAsUser(

            @NonNull ComponentName admin,  Intent serviceIntent, @NonNull ServiceConnection conn,
@@ -6750,6 +6757,29 @@ public class DevicePolicyManager { 
        }

    }



    /**

     * Returns the list of target users that the calling device or profile owner can use when

     * calling {@link #bindDeviceAdminServiceAsUser}.

     * <p>

     * A device owner can bind to a service from a profile owner of a managed profile and

     * vice versa, provided that:

     * <ul>

     * <li>Both belong to the same package name.

     * <li>The managed profile is a profile of the user where the device owner is set.

     *     See {@link UserManager#getUserProfiles()}

     * <li>Both users are affiliated.

     *         STOPSHIP(b/32326223) Add reference to setAffiliationIds here once public.

     * </ul>

     */

    public @NonNull List<UserHandle> getBindDeviceAdminTargetUsers(@NonNull ComponentName admin) {

        throwIfParentInstance("getBindDeviceAdminTargetUsers");

        try {

            return mService.getBindDeviceAdminTargetUsers(admin);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

    }



    /**

     * Called by the system to get the time at which the device owner last retrieved security

     * logging entries.

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

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ interface IDevicePolicyManager { 
    boolean bindDeviceAdminServiceAsUser(in ComponentName admin,

        IApplicationThread caller, IBinder token, in Intent service,

        IServiceConnection connection, int flags, int targetUserId);

    List<UserHandle> getBindDeviceAdminTargetUsers(in ComponentName admin);



    long getLastSecurityLogRetrievalTime();

    long getLastBugReportRequestTime();