Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33b49648 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents cd32b42e 653c3243

api/removed.txt

+0 −1
Original line number Diff line number Diff line
@@ -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

  }



}

api/system-removed.txt

+0 −1
Original line number Diff line number Diff line
@@ -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

  }



}

api/test-removed.txt

+0 −1
Original line number Diff line number Diff line
@@ -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

  }



}

core/java/android/app/admin/DevicePolicyManager.java

+0 −7
Original line number Diff line number Diff line
@@ -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})