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

Commit 5cf54947 authored by Andrew Scull's avatar Andrew Scull Committed by android-build-merger
Browse files

Merge "Expand abbreviation in constant identifier." into oc-dev am: 2c20a0f8 

am: 7d32c0bd

Change-Id: I435db9c38e42cb0d2dbf82441470e45dc37728cc
parents 53de9dd5 7d32c0bd

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6514,7 +6514,7 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_PORT = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID";

    field public static final int FLAG_EVICT_CE_KEY = 1; // 0x1

    field public static final int FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY = 1; // 0x1

    field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2

    field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1

    field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff

api/removed.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 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-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6759,7 +6759,7 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_PORT = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID";

    field public static final int FLAG_EVICT_CE_KEY = 1; // 0x1

    field public static final int FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY = 1; // 0x1

    field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2

    field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1

    field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff

api/system-removed.txt

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 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-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6544,7 +6544,7 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID";

    field public static final java.lang.String EXTRA_RESTRICTION = "android.app.extra.RESTRICTION";

    field public static final int FLAG_EVICT_CE_KEY = 1; // 0x1

    field public static final int FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY = 1; // 0x1

    field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2

    field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1

    field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff