diff options
| author | Robin Lee <rgl@google.com> | 2017-02-20 20:54:22 +0000 |
|---|---|---|
| committer | Robin Lee <rgl@google.com> | 2017-02-28 18:07:08 +0000 |
| commit | abaa0695c5361b36a7a2cdbe87c77bf60be20af7 (patch) | |
| tree | d4df278a80bfdd1b25373072946426981bbfe884 /keystore/java/android/security/IKeyChainService.aidl | |
| parent | c98c16ded8738054242b2576a74e145f834b6efa (diff) | |
Delete ParcelableString, add StringParceledListSlice
Both inherit from package private BaseParceledListSlice.
This is still bad, but it's not as bad. The existing code that uses
this can just do Foo.bar().getList() now instead of having to marshal
to and from an oddball type at either end as well.
In the longer term ParceledListSlice<> should be eliminated, but it's
not clear how far into the future that is going to happen.
Test: runtest -x services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: runtest -x core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java
Change-Id: Ie69b96b5215d6e04990f6d31345772cdfee21d78
Diffstat (limited to 'keystore/java/android/security/IKeyChainService.aidl')
| -rw-r--r-- | keystore/java/android/security/IKeyChainService.aidl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystore/java/android/security/IKeyChainService.aidl b/keystore/java/android/security/IKeyChainService.aidl index deea9726403f..b68543146a51 100644 --- a/keystore/java/android/security/IKeyChainService.aidl +++ b/keystore/java/android/security/IKeyChainService.aidl @@ -15,7 +15,7 @@ */ package android.security; -import android.content.pm.ParceledListSlice; +import android.content.pm.StringParceledListSlice; /** * Caller is required to ensure that {@link KeyStore#unlock @@ -39,8 +39,8 @@ interface IKeyChainService { // APIs used by Settings boolean deleteCaCertificate(String alias); boolean reset(); - ParceledListSlice getUserCaAliases(); - ParceledListSlice getSystemCaAliases(); + StringParceledListSlice getUserCaAliases(); + StringParceledListSlice getSystemCaAliases(); boolean containsCaAlias(String alias); byte[] getEncodedCaCertificate(String alias, boolean includeDeletedSystem); List<String> getCaCertificateChainAliases(String rootAlias, boolean includeDeletedSystem); |