diff options
| author | Jim Miller <jaggies@google.com> | 2010-06-08 16:33:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-08 16:33:26 -0700 |
| commit | 3b68548da60ab3249fbc89b8e587e22485630f32 (patch) | |
| tree | 2f7caf5654ffecfb79e24668a1a237106417672a /core | |
| parent | 1debc66521f699bbf0a8eb80cababaef8bc63607 (diff) | |
| parent | 75b6a6b972e6b18143fd629d3d9c824c442c5f4c (diff) | |
| download | frameworks_base-3b68548da60ab3249fbc89b8e587e22485630f32.zip frameworks_base-3b68548da60ab3249fbc89b8e587e22485630f32.tar.gz frameworks_base-3b68548da60ab3249fbc89b8e587e22485630f32.tar.bz2 | |
am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken
* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix 2737842: Disable KeguardManager API if device policy is enabled
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 35e7ee6..296d70a4 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -78,6 +78,15 @@ public class DevicePolicyManager { = "android.app.action.ADD_DEVICE_ADMIN"; /** + * Activity action: send when any policy admin changes a policy. + * This is generally used to find out when a new policy is in effect. + * + * @hide + */ + public static final String ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED + = "android.app.action.DEVICE_POLICY_MANAGER_STATE_CHANGED"; + + /** * The ComponentName of the administrator component. * * @see #ACTION_ADD_DEVICE_ADMIN |