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 /core/java/android/content | |
| 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 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/Intent.java | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index d0298cd..6f543a8 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2589,21 +2589,6 @@ public class Intent implements Parcelable, Cloneable { "android.intent.action.GET_RESTRICTION_ENTRIES"; /** - * @hide - * Activity to challenge the user for a PIN that was configured when setting up - * restrictions. Restrictions include blocking of apps and preventing certain user operations, - * controlled by {@link android.os.UserManager#setUserRestrictions(Bundle). - * Launch the activity using - * {@link android.app.Activity#startActivityForResult(Intent, int)} and check if the - * result is {@link android.app.Activity#RESULT_OK} for a successful response to the - * challenge.<p/> - * Before launching this activity, make sure that there is a PIN in effect, by calling - * {@link android.os.UserManager#hasRestrictionsChallenge()}. - */ - public static final String ACTION_RESTRICTIONS_CHALLENGE = - "android.intent.action.RESTRICTIONS_CHALLENGE"; - - /** * Sent the first time a user is starting, to allow system apps to * perform one time initialization. (This will not be seen by third * party applications because a newly initialized user does not have any |