diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-05-08 09:02:38 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-05-08 09:02:38 -0700 |
| commit | eae1da7788f0f9f37fa142a2df34bfaec1f4253e (patch) | |
| tree | 7d697632244fe7ec27b5f5fc99e60f03ef507044 /api | |
| parent | dc9b2dfae2d2c0ef6d7e8d769a78abc17add537a (diff) | |
| download | frameworks_base-eae1da7788f0f9f37fa142a2df34bfaec1f4253e.zip frameworks_base-eae1da7788f0f9f37fa142a2df34bfaec1f4253e.tar.gz frameworks_base-eae1da7788f0f9f37fa142a2df34bfaec1f4253e.tar.bz2 | |
Replace "TEE" with "secure hardware".
This is to make the Android KeyStore API more generic.
Bug: 18088752
Change-Id: I18bcc96db4af17127e5dc038becc9deb85bb48aa
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index cdc2404..929da0e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28593,9 +28593,9 @@ package android.security { method public int getPurposes(); method public java.lang.String[] getSignaturePaddings(); method public int getUserAuthenticationValidityDurationSeconds(); - method public boolean isTeeBacked(); + method public boolean isInsideSecureHardware(); method public boolean isUserAuthenticationRequired(); - method public boolean isUserAuthenticationRequirementTeeEnforced(); + method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware(); } public final class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter { diff --git a/api/system-current.txt b/api/system-current.txt index 7012773..f9fa4e3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30607,9 +30607,9 @@ package android.security { method public int getPurposes(); method public java.lang.String[] getSignaturePaddings(); method public int getUserAuthenticationValidityDurationSeconds(); - method public boolean isTeeBacked(); + method public boolean isInsideSecureHardware(); method public boolean isUserAuthenticationRequired(); - method public boolean isUserAuthenticationRequirementTeeEnforced(); + method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware(); } public final class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter { |