diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/DeviceAdminInfo.java | 19 | ||||
| -rw-r--r-- | core/java/android/app/DevicePolicyManager.java | 2 | ||||
| -rw-r--r-- | core/jni/Android.mk | 2 | ||||
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 4 | ||||
| -rw-r--r-- | core/jni/android_view_Display.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_view_Surface.cpp | 2 | ||||
| -rw-r--r-- | core/jni/com_google_android_gles_jni_EGLImpl.cpp | 2 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 9 |
8 files changed, 14 insertions, 28 deletions
diff --git a/core/java/android/app/DeviceAdminInfo.java b/core/java/android/app/DeviceAdminInfo.java index ab9c44f..031bc8e 100644 --- a/core/java/android/app/DeviceAdminInfo.java +++ b/core/java/android/app/DeviceAdminInfo.java @@ -80,23 +80,15 @@ public final class DeviceAdminInfo implements Parcelable { public static final int USES_POLICY_RESET_PASSWORD = 2; /** - * A type of policy that this device admin can use: able to limit the + * A type of policy that this device admin can use: able to force the device + * to lock via{@link DevicePolicyManager#lockNow} or limit the * maximum lock timeout for the device via * {@link DevicePolicyManager#setMaximumTimeToLock}. * - * <p>To control this policy, the device admin must have a "limit-unlock" - * tag in the "uses-policies" section of its meta-data. - */ - public static final int USES_POLICY_LIMIT_UNLOCK = 3; - - /** - * A type of policy that this device admin can use: able to force the device - * to lock via{@link DevicePolicyManager#lockNow}. - * * <p>To control this policy, the device admin must have a "force-lock" * tag in the "uses-policies" section of its meta-data. */ - public static final int USES_POLICY_FORCE_LOCK = 4; + public static final int USES_POLICY_FORCE_LOCK = 3; /** * A type of policy that this device admin can use: able to factory @@ -106,7 +98,7 @@ public final class DeviceAdminInfo implements Parcelable { * <p>To control this policy, the device admin must have a "wipe-data" * tag in the "uses-policies" section of its meta-data. */ - public static final int USES_POLICY_WIPE_DATA = 5; + public static final int USES_POLICY_WIPE_DATA = 4; /** @hide */ public static class PolicyInfo { @@ -140,9 +132,6 @@ public final class DeviceAdminInfo implements Parcelable { sPoliciesDisplayOrder.add(new PolicyInfo(USES_POLICY_WATCH_LOGIN, "watch-login", com.android.internal.R.string.policylab_watchLogin, com.android.internal.R.string.policydesc_watchLogin)); - sPoliciesDisplayOrder.add(new PolicyInfo(USES_POLICY_LIMIT_UNLOCK, "limit-unlock", - com.android.internal.R.string.policylab_limitUnlock, - com.android.internal.R.string.policydesc_limitUnlock)); sPoliciesDisplayOrder.add(new PolicyInfo(USES_POLICY_FORCE_LOCK, "force-lock", com.android.internal.R.string.policylab_forceLock, com.android.internal.R.string.policydesc_forceLock)); diff --git a/core/java/android/app/DevicePolicyManager.java b/core/java/android/app/DevicePolicyManager.java index 847e879..82c43dc 100644 --- a/core/java/android/app/DevicePolicyManager.java +++ b/core/java/android/app/DevicePolicyManager.java @@ -410,7 +410,7 @@ public class DevicePolicyManager { * the length that the user can set. It takes effect immediately. * * <p>The calling device admin must have requested - * {@link DeviceAdminInfo#USES_POLICY_LIMIT_UNLOCK} to be able to call + * {@link DeviceAdminInfo#USES_POLICY_FORCE_LOCK} to be able to call * this method; if it has not, a security exception will be thrown. * * @param admin Which {@link DeviceAdmin} this request is associated with. diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 1ffd265..e8749ed 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -159,6 +159,8 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libnetutils \ libui \ + libsurfaceflinger_client \ + libcamera_client \ libskiagl \ libskia \ libsqlite \ diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 03107a4..9c0e282 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -25,8 +25,8 @@ #include <utils/Vector.h> -#include <ui/Surface.h> -#include <ui/Camera.h> +#include <surfaceflinger/Surface.h> +#include <camera/Camera.h> #include <binder/IMemory.h> using namespace android; diff --git a/core/jni/android_view_Display.cpp b/core/jni/android_view_Display.cpp index bb7b5ef..2e160ae 100644 --- a/core/jni/android_view_Display.cpp +++ b/core/jni/android_view_Display.cpp @@ -17,7 +17,7 @@ #include <stdio.h> #include <assert.h> -#include <ui/SurfaceComposerClient.h> +#include <surfaceflinger/SurfaceComposerClient.h> #include <ui/PixelFormat.h> #include <ui/DisplayInfo.h> diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 40c8aa0..723205a 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -18,7 +18,7 @@ #include "android_util_Binder.h" -#include <ui/SurfaceComposerClient.h> +#include <surfaceflinger/SurfaceComposerClient.h> #include <ui/Region.h> #include <ui/Rect.h> diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index 974fc0b..6a8c4b9 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -21,7 +21,7 @@ #include <EGL/egl.h> #include <GLES/gl.h> -#include <ui/Surface.h> +#include <surfaceflinger/Surface.h> #include <SkBitmap.h> #include <SkPixelRef.h> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 7f66111..9e596ef 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1218,16 +1218,11 @@ <string name="policydesc_resetPassword">Force your password to a new value, requiring the administrator give it to you before you can log in.</string> - <!-- Title of policy access to limiting the user's unlock timeout --> - <string name="policylab_limitUnlock">Limit lock timeout</string> - <!-- Description of policy access to limiting the user's unlock timeout --> - <string name="policydesc_limitUnlock">Restrict the unlock timeout - durations you can select.</string> <!-- Title of policy access to force lock the device --> <string name="policylab_forceLock">Force lock</string> <!-- Description of policy access to limiting the user's password choices --> - <string name="policydesc_forceLock">Force the device to immediately lock, - requiring that you re-enter its password.</string> + <string name="policydesc_forceLock">Control when device locks, + requiring you re-enter its password.</string> <!-- Title of policy access to wipe the user's data --> <string name="policylab_wipeData">Erase all data</string> <!-- Description of policy access to wipe the user's data --> |