diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-01-08 17:17:44 +0000 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2016-01-15 11:39:16 +0000 |
| commit | c992109885e37e9dfa637cdd6a54db58050488eb (patch) | |
| tree | 7e11a7a7f0df848d7018fafc3db2f4ecd4ab06de /core/java/android | |
| parent | 61becc4592131068c849e345314a2020faebdd19 (diff) | |
Introduce new intent action to set parent challenge
Introduce a new intent action that triggers setting of the challenge of
the parent user. The existing intent action is repurposed to always
trigger setting the challenge of the calling user.
Change-Id: Ia7afe268b2de95537bed5bbb57163fd23bb55b6a
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index c7f11e2fe6d2..45b23d0d1609 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -773,12 +773,28 @@ public class DevicePolicyManager { * have the user select a new password in order to meet the current * constraints. Upon being resumed from this activity, you can check the new * password characteristics to see if they are sufficient. + * + * If the intent is launched from within a managed profile with a profile + * owner built against {@link android.os.Build.VERSION_CODES#M} or before, + * this will trigger entering a new password for the parent of the profile. + * For all other cases it will trigger entering a new password for the user + * or profile it is launched from. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_SET_NEW_PASSWORD = "android.app.action.SET_NEW_PASSWORD"; /** + * Activity action: have the user enter a new password for the parent profile. + * If the intent is launched from within a managed profile, this will trigger + * entering a new password for the parent of the profile. In all other cases + * the behaviour is identical to {@link #ACTION_SET_NEW_PASSWORD}. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_SET_NEW_PARENT_PROFILE_PASSWORD + = "android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD"; + + /** * Flag used by {@link #addCrossProfileIntentFilter} to allow activities in * the parent profile to access intents sent from the managed profile. * That is, when an app in the managed profile calls |
