Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adrian Roos
2016-05-12 20:52:24 +00:00
committed by Android (Google) Code Review
parent 8d18eefe50 7f06eed7f5
commit 11c8f5315b
5 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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_ALL = 2147483647; // 0x7fffffff
field public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; // 0x0 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_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_CAMERA = 2; // 0x2
field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4 field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4
field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10 field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10

1
api/system-current.txt
View File

@@ -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_ALL = 2147483647; // 0x7fffffff
field public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; // 0x0 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_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_CAMERA = 2; // 0x2
field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4 field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4
field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10 field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10

1
api/test-current.txt
View File

@@ -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_ALL = 2147483647; // 0x7fffffff
field public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; // 0x0 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_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_CAMERA = 2; // 0x2
field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4 field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4
field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10 field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10

5
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -2570,6 +2570,11 @@ public class DevicePolicyManager {
*/ */
public static final int KEYGUARD_DISABLE_FINGERPRINT = 1 << 5; 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. * Disable all current and future keyguard customizations.
*/ */

5
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -2246,9 +2246,12 @@ public abstract class BaseStatusBar extends SystemUI implements
Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT, Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT,
0, 0,
mCurrentUserId) != 0; mCurrentUserId) != 0;
final boolean remoteInputDpm = (dpmFlags
& DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT) == 0;
setShowLockscreenNotifications(show && allowedByDpm); setShowLockscreenNotifications(show && allowedByDpm);
setLockScreenAllowRemoteInput(remoteInput); setLockScreenAllowRemoteInput(remoteInput && remoteInputDpm);
} }
protected abstract void setAreThereNotifications(); protected abstract void setAreThereNotifications();