diff options
| author | Esteban Talavera <etalavera@google.com> | 2014-08-21 14:58:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-21 14:58:18 +0000 |
| commit | 2df7d1ef51ebff5228e0cbd7e15a34fce7307390 (patch) | |
| tree | 5dcb9af2407b8cd3fa4d690f2d53aa319700df10 /api | |
| parent | 20303426ac8476f33fbb1a0b99dad6aa59e6bb32 (diff) | |
| parent | f057f06631e32471cd1ce8f34222251c0537a406 (diff) | |
| download | frameworks_base-2df7d1ef51ebff5228e0cbd7e15a34fce7307390.zip frameworks_base-2df7d1ef51ebff5228e0cbd7e15a34fce7307390.tar.gz frameworks_base-2df7d1ef51ebff5228e0cbd7e15a34fce7307390.tar.bz2 | |
Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 977d782..73f10b8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5527,6 +5527,7 @@ package android.app.admin { field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10 field public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 8; // 0x8 field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1; // 0x1 + field public static final java.lang.String MIME_TYPE_PROVISIONING_NFC = "application/com.android.managedprovisioning"; field public static final int PASSWORD_QUALITY_ALPHABETIC = 262144; // 0x40000 field public static final int PASSWORD_QUALITY_ALPHANUMERIC = 327680; // 0x50000 field public static final int PASSWORD_QUALITY_BIOMETRIC_WEAK = 32768; // 0x8000 @@ -5535,7 +5536,6 @@ package android.app.admin { field public static final int PASSWORD_QUALITY_NUMERIC_COMPLEX = 196608; // 0x30000 field public static final int PASSWORD_QUALITY_SOMETHING = 65536; // 0x10000 field public static final int PASSWORD_QUALITY_UNSPECIFIED = 0; // 0x0 - field public static final java.lang.String PROVISIONING_NFC_MIME_TYPE = "application/com.android.managedprovisioning"; field public static final int RESET_PASSWORD_REQUIRE_ENTRY = 1; // 0x1 field public static final int WIPE_EXTERNAL_STORAGE = 1; // 0x1 } |