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

Commit e9b397ff authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop managed profile owner granting READ_SMS" into qt-dev am:... 

Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e50 am: 676cefb0 am: 539fea38 am: e13c6379 am: e456e2f6 am: fe2c3c26 am: e7253363 am: 4e8fadf9 am: 45ee5178 am: f76ce81e

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



Change-Id: I2a3893cb130c38f8145c6212a6cabaf0ef613283
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e8a3d4f f76ce81e

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -12150,6 +12150,15 @@ public class DevicePolicyManager { 
     * Attempts by the admin to grant these permissions, when the admin is restricted from doing

     * Attempts by the admin to grant these permissions, when the admin is restricted from doing

     * so, will be silently ignored (no exception will be thrown).

     * so, will be silently ignored (no exception will be thrown).

     *

     *

     * Control over the following permissions are restricted for managed profile owners:

     * <ul>

     *  <li>Manifest.permission.READ_SMS</li>

     * </ul>

     * <p>

     * A managed profile owner may not grant these permissions (i.e. call this method with any of

     * the permissions listed above and {@code grantState} of

     * {@code #PERMISSION_GRANT_STATE_GRANTED}), but may deny them.

     *

     * @param admin Which profile or device owner this request is associated with.

     * @param admin Which profile or device owner this request is associated with.

     * @param packageName The application to grant or revoke a permission to.

     * @param packageName The application to grant or revoke a permission to.

     * @param permission The permission to grant or revoke.

     * @param permission The permission to grant or revoke.