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

Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev

Browse Source
This commit is contained in:
Sander Alewijnse
2014-11-07 22:24:58 +00:00
committed by Android (Google) Code Review
parent 48c8cd06aa 53d63dcd04
commit 3eed90f393
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -22377,6 +22377,7 @@ package android.os {
field public static final java.lang.String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone";
field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";
field public static final java.lang.String ENSURE_VERIFY_APPS = "ensure_verify_apps";
field public static final java.lang.String KEY_RESTRICTIONS_PENDING = "restrictions_pending";
}
public abstract class Vibrator {

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

@@ -2586,6 +2586,10 @@ public class DevicePolicyManager {
* <p>The application restrictions are only made visible to the target application and the
* profile or device owner.
*
* <p>If the restrictions are not available yet, but may be applied in the near future,
* the admin can notify the target application of that by adding
* {@link UserManager#KEY_RESTRICTIONS_PENDING} to the settings parameter.
*
* <p>The calling device admin must be a profile or device owner; if it is not, a security
* exception will be thrown.
*
@@ -2593,6 +2597,8 @@ public class DevicePolicyManager {
* @param packageName The name of the package to update restricted settings for.
* @param settings A {@link Bundle} to be parsed by the receiving application, conveying a new
* set of active restrictions.
*
* @see UserManager#KEY_RESTRICTIONS_PENDING
*/
public void setApplicationRestrictions(ComponentName admin, String packageName,
Bundle settings) {

18
core/java/android/os/UserManager.java
View File

@@ -371,6 +371,24 @@ public class UserManager {
*/
public static final String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";
/**
* Application restriction key that is used to indicate the pending arrival
* of real restrictions for the app.
*
* <p>
* Applications that support restrictions should check for the presence of this key.
* A <code>true</code> value indicates that restrictions may be applied in the near
* future but are not available yet. It is the responsibility of any
* management application that sets this flag to update it when the final
* restrictions are enforced.
*
* <p/>Key for application restrictions.
* <p/>Type: Boolean
* @see android.app.admin.DevicePolicyManager#addApplicationRestriction()
* @see android.app.admin.DevicePolicyManager#getApplicationRestriction()
*/
public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending";
/** @hide */
public static final int PIN_VERIFICATION_FAILED_INCORRECT = -3;
/** @hide */