diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-02-11 12:34:08 -0500 |
|---|---|---|
| committer | Julia Reynolds <juliacr@google.com> | 2015-03-04 17:36:00 -0500 |
| commit | e925440a551b66a3d3121ec8badaf948d71d66a1 (patch) | |
| tree | de4d687777ba68b90a63e8ebe7ede03a4f0ea1ec /api | |
| parent | aa7e7318e3bd33dc40792d35ca3a29d8d9ada4a2 (diff) | |
| download | frameworks_base-e925440a551b66a3d3121ec8badaf948d71d66a1.zip frameworks_base-e925440a551b66a3d3121ec8badaf948d71d66a1.tar.gz frameworks_base-e925440a551b66a3d3121ec8badaf948d71d66a1.tar.bz2 | |
DOs can clear the DI; rehide hasUserSetupCompleted.
Bug: 19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 163e9d0..ef400ea 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5492,7 +5492,6 @@ package android.app.admin { method public int getStorageEncryptionStatus(); method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]); method public boolean hasGrantedPolicy(android.content.ComponentName, int); - method public boolean hasUserSetupCompleted(); method public boolean installCaCert(android.content.ComponentName, byte[]); method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String); method public boolean isActivePasswordSufficient(); diff --git a/api/system-current.txt b/api/system-current.txt index 8a9259f..8d76673 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5593,7 +5593,6 @@ package android.app.admin { method public int getStorageEncryptionStatus(); method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]); method public boolean hasGrantedPolicy(android.content.ComponentName, int); - method public boolean hasUserSetupCompleted(); method public boolean installCaCert(android.content.ComponentName, byte[]); method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String); method public boolean isActivePasswordSufficient(); @@ -30906,8 +30905,8 @@ package android.telecom { method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle); field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS"; field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE"; - field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS"; field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED"; + field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS"; field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS"; field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS"; field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ',' |