diff --git a/api/removed.txt b/api/removed.txt index e7b573bdb2617..f52b39a737ebe 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -73,7 +73,6 @@ package android.app.admin { method public deprecated java.lang.String getDeviceInitializerApp(); method public deprecated android.content.ComponentName getDeviceInitializerComponent(); method public void setAffiliationIds(android.content.ComponentName, java.util.List); - field public static final deprecated int FLAG_EVICT_CE_KEY = 1; // 0x1 } } diff --git a/api/system-removed.txt b/api/system-removed.txt index 15de5c471d1a3..9f3970daf36ca 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -71,7 +71,6 @@ package android.app.admin { method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle); method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String); method public void setAffiliationIds(android.content.ComponentName, java.util.List); - field public static final deprecated int FLAG_EVICT_CE_KEY = 1; // 0x1 } } diff --git a/api/test-removed.txt b/api/test-removed.txt index e7b573bdb2617..f52b39a737ebe 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -73,7 +73,6 @@ package android.app.admin { method public deprecated java.lang.String getDeviceInitializerApp(); method public deprecated android.content.ComponentName getDeviceInitializerComponent(); method public void setAffiliationIds(android.content.ComponentName, java.util.List); - field public static final deprecated int FLAG_EVICT_CE_KEY = 1; // 0x1 } } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 109b5bb35b5a5..de80c36bc5616 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3038,13 +3038,6 @@ public class DevicePolicyManager { */ public static final int FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY = 1; - /** - * Instead use {@link #FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY}. - * @removed - */ - @Deprecated - public static final int FLAG_EVICT_CE_KEY = 1; - /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef(flag=true, value={FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY})