summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-09-05 09:30:23 -0700
committerAmith Yamasani <yamasani@google.com>2013-09-05 09:30:23 -0700
commitd304af69891483aad808356af1ac5f00e90c8edf (patch)
treef21913b88c786d810e3c904cd75bcf9737238d70 /api
parent1b039b1d2e93cef528da3dcf01b328d6286e9d98 (diff)
downloadframeworks_base-d304af69891483aad808356af1ac5f00e90c8edf.zip
frameworks_base-d304af69891483aad808356af1ac5f00e90c8edf.tar.gz
frameworks_base-d304af69891483aad808356af1ac5f00e90c8edf.tar.bz2
Remove unused APIs and rename others based on API review
Restrictions challenge is only to be used by device admins. Bug: 10461761 Change-Id: I3db1249e2ce99f386602de59ed930302bb0a97fb
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index eb3596a..18e3261 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6373,7 +6373,6 @@ package android.content {
field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";
- field public static final java.lang.String ACTION_RESTRICTIONS_PIN_CHALLENGE = "android.intent.action.RESTRICTIONS_PIN_CHALLENGE";
field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN";
field public static final java.lang.String ACTION_SCREEN_OFF = "android.intent.action.SCREEN_OFF";
field public static final java.lang.String ACTION_SCREEN_ON = "android.intent.action.SCREEN_ON";
@@ -18604,14 +18603,13 @@ package android.os {
method public java.lang.String getUserName();
method public android.os.Bundle getUserRestrictions();
method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
- method public boolean hasRestrictionsPin();
method public boolean isUserAGoat();
method public boolean isUserRunning(android.os.UserHandle);
method public boolean isUserRunningOrStopping(android.os.UserHandle);
+ method public boolean setRestrictionsChallenge(java.lang.String);
method public void setUserRestriction(java.lang.String, boolean);
method public void setUserRestrictions(android.os.Bundle);
method public void setUserRestrictions(android.os.Bundle, android.os.UserHandle);
- field public static final java.lang.String DISALLOW_APP_RESTRICTIONS = "no_app_restrictions";
field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";
field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";
field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi";