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

Commit 6a40f090 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Make ENSURE_VERIFY_APPS global even when set by PO. 

Currently only device owner can set global user restrictions.
With this CL ENSURE_VERIFY_APPS will be global no matter who
enforces it, DO or PO.

To make it possible for system apps to check who enforces a
particular restriction in this case a new API method is added
to UserManager: getUserRestrictionSources which returns a list
of users who enforce the restriction.

Bug:31000521
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.UserRestrictionsTest (ag/1732744)
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/pm/UserRestrictionsUtilsTest.java
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java
Test: installed M on a Nexus5x device, created a managed profile with some user restrictions, and checked that after upgrading M->O all restrictions are preserved and split correctly into base, global and local.
Change-Id: I543d3ec9ef0cf2b730da6f7406021c0bba43b785
parent 84f43a3e

api/system-current.txt

+10 −1
Original line number Diff line number Diff line
@@ -32688,7 +32688,8 @@ package android.os { 
    method public android.os.UserHandle getUserForSerialNumber(long);

    method public java.lang.String getUserName();

    method public java.util.List<android.os.UserHandle> getUserProfiles();

    method public int getUserRestrictionSource(java.lang.String, android.os.UserHandle);

    method public deprecated int getUserRestrictionSource(java.lang.String, android.os.UserHandle);

    method public java.util.List<android.os.UserManager.EnforcingUser> getUserRestrictionSources(java.lang.String, android.os.UserHandle);

    method public android.os.Bundle getUserRestrictions();

    method public android.os.Bundle getUserRestrictions(android.os.UserHandle);

    method public boolean hasUserRestriction(java.lang.String);
@@ -32754,6 +32755,14 @@ package android.os { 
    field public static final int USER_CREATION_FAILED_NO_MORE_USERS = 2; // 0x2

  }













  public static final class UserManager.EnforcingUser implements android.os.Parcelable {













    method public int describeContents();













    method public android.os.UserHandle getUserHandle();













    method public int getUserRestrictionSource();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.os.UserManager.EnforcingUser> CREATOR;













  }



























  public static abstract class UserManager.UserRestrictionSource implements java.lang.annotation.Annotation {















  }







































core/java/android/os/IUserManager.aidl



+2
−0




























Original line number
Diff line number
Diff line








@@ -19,6 +19,7 @@ package android.os;





























import android.os.Bundle;















import android.os.PersistableBundle;













import android.os.UserManager;















import android.content.pm.UserInfo;















import android.content.IntentSender;















import android.content.RestrictionEntry;










@@ -61,6 +62,7 @@ interface IUserManager {













    int getUserSerialNumber(int userHandle);















    int getUserHandle(int userSerialNumber);















    int getUserRestrictionSource(String restrictionKey, int userHandle);













    List<UserManager.EnforcingUser> getUserRestrictionSources(String restrictionKey, int userHandle);















    Bundle getUserRestrictions(int userHandle);















    boolean hasBaseUserRestriction(String restrictionKey, int userHandle);















    boolean hasUserRestriction(in String restrictionKey, int userHandle);

































core/java/android/os/UserManager.aidl
0 → 100644



+20
−0




























Original line number
Diff line number
Diff line













/*













**













** Copyright 2016, The Android Open Source Project













**













** Licensed under the Apache License, Version 2.0 (the "License");













** you may not use this file except in compliance with the License.













** You may obtain a copy of the License at













**













**     http://www.apache.org/licenses/LICENSE-2.0













**













** Unless required by applicable law or agreed to in writing, software













** distributed under the License is distributed on an "AS IS" BASIS,













** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













** See the License for the specific language governing permissions and













** limitations under the License.













*/



























package android.os;



























parcelable UserManager.EnforcingUser;










 No newline at end of file
























core/java/android/os/UserManager.java



+92
−2




























Original line number
Diff line number
Diff line








@@ -1187,7 +1187,9 @@ public class UserManager {













     * @return The source of user restriction. Any combination of {@link #RESTRICTION_NOT_SET},















     *         {@link #RESTRICTION_SOURCE_SYSTEM}, {@link #RESTRICTION_SOURCE_DEVICE_OWNER}















     *         and {@link #RESTRICTION_SOURCE_PROFILE_OWNER}













     * @deprecated use {@link #getUserRestrictionSources(String, int)} instead.















     */













    @Deprecated















    @SystemApi















    @UserRestrictionSource















    public int getUserRestrictionSource(String restrictionKey, UserHandle userHandle) {









@@ -1198,6 +1200,25 @@ public class UserManager {













        }















    }





























    /**













     * @hide













     *













     * Returns a list of users who set a user restriction on a given user.













     * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.













     * @param restrictionKey the string key representing the restriction













     * @param userHandle the UserHandle of the user for whom to retrieve the restrictions.













     * @return a list of user ids enforcing this restriction.













     */













    @SystemApi













    public List<EnforcingUser> getUserRestrictionSources(













            String restrictionKey, UserHandle userHandle) {













        try {













            return mService.getUserRestrictionSources(restrictionKey, userHandle.getIdentifier());













        } catch (RemoteException re) {













            throw re.rethrowFromSystemServer();













        }













    }





























    /**















     * Returns the user-wide restrictions imposed on this user.















     * @return a Bundle containing all the restrictions.










@@ -2310,8 +2331,8 @@ public class UserManager {













     * @hide















     * Checks if any uninitialized user has the specific seed account name and type.















     *













     * @param mAccountName The account name to check for













     * @param mAccountType The account type of the account to check for













     * @param accountName The account name to check for













     * @param accountType The account type of the account to check for















     * @return whether the seed account was found















     */















    public boolean someUserHasSeedAccount(String accountName, String accountType) {









@@ -2321,4 +2342,73 @@ public class UserManager {













            throw re.rethrowFromSystemServer();















        }















    }



























    /**













     * @hide













     * User that enforces a restriction.













     *













     * @see #getUserRestrictionSources(String, UserHandle)













     */













    @SystemApi













    public static final class EnforcingUser implements Parcelable {













        private final @UserIdInt int userId;













        private final @UserRestrictionSource int userRestrictionSource;



























        /**













         * @hide













         */













        public EnforcingUser(













                @UserIdInt int userId, @UserRestrictionSource int userRestrictionSource) {













            this.userId = userId;













            this.userRestrictionSource = userRestrictionSource;













        }



























        private EnforcingUser(Parcel in) {













            userId = in.readInt();













            userRestrictionSource = in.readInt();













        }



























        public static final Creator<EnforcingUser> CREATOR = new Creator<EnforcingUser>() {













            @Override













            public EnforcingUser createFromParcel(Parcel in) {













                return new EnforcingUser(in);













            }



























            @Override













            public EnforcingUser[] newArray(int size) {













                return new EnforcingUser[size];













            }













        };



























        @Override













        public int describeContents() {













            return 0;













        }



























        @Override













        public void writeToParcel(Parcel dest, int flags) {













            dest.writeInt(userId);













            dest.writeInt(userRestrictionSource);













        }



























        /**













         * Returns an id of the enforcing user.













         *













         * <p> Will be UserHandle.USER_NULL when restriction is set by the system.













         */













        public UserHandle getUserHandle() {













            return UserHandle.of(userId);













        }



























        /**













         * Returns the status of the enforcing user.













         *













         * <p> One of {@link #RESTRICTION_SOURCE_SYSTEM},













         * {@link #RESTRICTION_SOURCE_DEVICE_OWNER} and













         * {@link #RESTRICTION_SOURCE_PROFILE_OWNER}













         */













        public @UserRestrictionSource int getUserRestrictionSource() {













            return userRestrictionSource;













        }













    }















}
























core/java/android/os/UserManagerInternal.java



+15
−11




























Original line number
Diff line number
Diff line








@@ -15,7 +15,6 @@













 */















package android.os;





























import android.annotation.NonNull;















import android.annotation.Nullable;















import android.content.pm.UserInfo;















import android.graphics.Bitmap;









@@ -24,6 +23,10 @@ import android.graphics.Bitmap;













 * @hide Only for use within the system server.















 */















public abstract class UserManagerInternal {













    public static final int CAMERA_NOT_DISABLED = 0;













    public static final int CAMERA_DISABLED_LOCALLY = 1;













    public static final int CAMERA_DISABLED_GLOBALLY = 2;





























    public interface UserRestrictionsListener {















        /**















         * Called when a user restriction changes.









@@ -36,18 +39,19 @@ public abstract class UserManagerInternal {













    }































    /**













     * Called by {@link com.android.server.devicepolicy.DevicePolicyManagerService}













     * to set per-user as well as global user restrictions.













     * Called by {@link com.android.server.devicepolicy.DevicePolicyManagerService} to set













     * restrictions enforced by the user.















     *















     * @param userId target user id for the local restrictions.













     * @param localRestrictions per-user restrictions.













     *     Caller must not change it once passed to this method.













     * @param globalRestrictions global restrictions set by DO.  Must be null when PO changed user













     *     restrictions, in which case global restrictions won't change.













     *     Caller must not change it once passed to this method.













     */













    public abstract void setDevicePolicyUserRestrictions(int userId,













            @NonNull Bundle localRestrictions, @Nullable Bundle globalRestrictions);













     * @param restrictions a bundle of user restrictions.













     * @param isDeviceOwner whether {@code userId} corresponds to device owner user id.













     * @param cameraRestrictionScope is camera disabled and if so what is the scope of restriction.













     *        Should be one of {@link #CAMERA_NOT_DISABLED}, {@link #CAMERA_DISABLED_LOCALLY} or













     *                               {@link #CAMERA_DISABLED_GLOBALLY}













     */













    public abstract void setDevicePolicyUserRestrictions(int userId, @Nullable Bundle restrictions,













            boolean isDeviceOwner, int cameraRestrictionScope);





























    /**















     * Returns the "base" user restrictions.















     *