diff options
Diffstat (limited to 'shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java')
-rw-r--r-- | shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java index 2b587d1c1..e4a197af8 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java @@ -3,8 +3,6 @@ package org.robolectric.shadows; import static android.app.admin.DevicePolicyManager.LOCK_TASK_FEATURE_HOME; import static android.app.admin.DevicePolicyManager.LOCK_TASK_FEATURE_NOTIFICATIONS; import static android.app.admin.DevicePolicyManager.LOCK_TASK_FEATURE_OVERVIEW; -import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; -import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR2; import static android.os.Build.VERSION_CODES.LOLLIPOP; import static android.os.Build.VERSION_CODES.LOLLIPOP_MR1; import static android.os.Build.VERSION_CODES.M; @@ -215,7 +213,7 @@ public class ShadowDevicePolicyManager { storageEncryptionStatus = DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED; } - @Implementation(minSdk = JELLY_BEAN_MR2) + @Implementation protected boolean isDeviceOwnerApp(String packageName) { return deviceOwner != null && deviceOwner.getPackageName().equals(packageName); } @@ -351,7 +349,7 @@ public class ShadowDevicePolicyManager { /** * @see #setDeviceOwner(ComponentName) */ - @Implementation(minSdk = JELLY_BEAN_MR2) + @Implementation protected String getDeviceOwner() { return deviceOwner != null ? deviceOwner.getPackageName() : null; } @@ -1274,13 +1272,13 @@ public class ShadowDevicePolicyManager { .clearPackagePersistentPreferredActivities(packageName); } - @Implementation(minSdk = JELLY_BEAN_MR1) + @Implementation protected void setKeyguardDisabledFeatures(ComponentName admin, int which) { enforceActiveAdmin(admin); keyguardDisabledFeatures = which; } - @Implementation(minSdk = JELLY_BEAN_MR1) + @Implementation protected int getKeyguardDisabledFeatures(ComponentName admin) { return keyguardDisabledFeatures; } |