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

Commit a4f8525f authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "DPM control for remote input when locked" into nyc-dev 

am: 11c8f531

* commit '11c8f531':
  DPM control for remote input when locked

Change-Id: Id7074ffdc541d53d4607652cefc4bfdecaaaa335
parents cb2e3c61 11c8f531

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6073,6 +6073,7 @@ package android.app.admin { 
    field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff

    field public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; // 0x0

    field public static final int KEYGUARD_DISABLE_FINGERPRINT = 32; // 0x20

    field public static final int KEYGUARD_DISABLE_REMOTE_INPUT = 64; // 0x40

    field public static final int KEYGUARD_DISABLE_SECURE_CAMERA = 2; // 0x2

    field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4

    field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6240,6 +6240,7 @@ package android.app.admin { 
    field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff

    field public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; // 0x0

    field public static final int KEYGUARD_DISABLE_FINGERPRINT = 32; // 0x20

    field public static final int KEYGUARD_DISABLE_REMOTE_INPUT = 64; // 0x40

    field public static final int KEYGUARD_DISABLE_SECURE_CAMERA = 2; // 0x2

    field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4

    field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6078,6 +6078,7 @@ package android.app.admin { 
    field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff

    field public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; // 0x0

    field public static final int KEYGUARD_DISABLE_FINGERPRINT = 32; // 0x20

    field public static final int KEYGUARD_DISABLE_REMOTE_INPUT = 64; // 0x40

    field public static final int KEYGUARD_DISABLE_SECURE_CAMERA = 2; // 0x2

    field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4

    field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10

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

+5 −0
Original line number Diff line number Diff line
@@ -2570,6 +2570,11 @@ public class DevicePolicyManager { 
     */

    public static final int KEYGUARD_DISABLE_FINGERPRINT = 1 << 5;



    /**

     * Disable text entry into notifications on secure keyguard screens (e.g. PIN/Pattern/Password).

     */

    public static final int KEYGUARD_DISABLE_REMOTE_INPUT = 1 << 6;



    /**

     * Disable all current and future keyguard customizations.

     */

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+4 −1
Original line number Diff line number Diff line
@@ -2250,9 +2250,12 @@ public abstract class BaseStatusBar extends SystemUI implements 
                Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT,

                0,

                mCurrentUserId) != 0;

        final boolean remoteInputDpm = (dpmFlags

                & DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT) == 0;





        setShowLockscreenNotifications(show && allowedByDpm);

        setLockScreenAllowRemoteInput(remoteInput);

        setLockScreenAllowRemoteInput(remoteInput && remoteInputDpm);

    }



    protected abstract void setAreThereNotifications();