Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup API that is already @removed" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-12 00:13:51 +00:00
committed by Android (Google) Code Review
parent cd32b42e1c 653c32432d
commit 33b4964874
4 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/removed.txt
View File

@@ -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<java.lang.String>);
field public static final deprecated int FLAG_EVICT_CE_KEY = 1; // 0x1
}
}

1
api/system-removed.txt
View File

@@ -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<java.lang.String>);
field public static final deprecated int FLAG_EVICT_CE_KEY = 1; // 0x1
}
}

1
api/test-removed.txt
View File

@@ -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<java.lang.String>);
field public static final deprecated int FLAG_EVICT_CE_KEY = 1; // 0x1
}
}

7
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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})