diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-05-08 23:10:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 23:10:31 +0000 |
| commit | 4f434a04708e7a254afe2e0d362f715229dc15d1 (patch) | |
| tree | 1bea7ded584e6793017449bcf60ed9a2fe96f794 /api | |
| parent | 5823756335ec3ecbe024369e24a6b291471cea9a (diff) | |
| parent | ef24909d84db9d5aefb825ee1556089fcdcc1678 (diff) | |
| download | frameworks_base-4f434a04708e7a254afe2e0d362f715229dc15d1.zip frameworks_base-4f434a04708e7a254afe2e0d362f715229dc15d1.tar.gz frameworks_base-4f434a04708e7a254afe2e0d362f715229dc15d1.tar.bz2 | |
Merge "Remove restrictions PIN functionality" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 3dc5901..e17d6b6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23633,7 +23633,7 @@ package android.os { 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 deprecated boolean setRestrictionsChallenge(java.lang.String); method public deprecated void setUserRestriction(java.lang.String, boolean); method public deprecated void setUserRestrictions(android.os.Bundle); method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle); diff --git a/api/system-current.txt b/api/system-current.txt index d807563..f35caab 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -25544,7 +25544,7 @@ package android.os { 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 deprecated boolean setRestrictionsChallenge(java.lang.String); method public deprecated void setUserRestriction(java.lang.String, boolean); method public deprecated void setUserRestrictions(android.os.Bundle); method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle); |