summaryrefslogtreecommitdiffstats
path: root/core/java/android/security
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-09-05 13:03:16 -0700
committerKenny Root <kroot@google.com>2013-09-05 13:27:00 -0700
commitb91773bce1126d28a93f73fbef18f3a79245f24e (patch)
treea7ab82da0330b4f4249c219dbea9efd17a2b7953 /core/java/android/security
parentd2676f9bd93c333ae2c7f3ca284d0fef5a7e146b (diff)
downloadframeworks_base-b91773bce1126d28a93f73fbef18f3a79245f24e.zip
frameworks_base-b91773bce1126d28a93f73fbef18f3a79245f24e.tar.gz
frameworks_base-b91773bce1126d28a93f73fbef18f3a79245f24e.tar.bz2
Add argument to binder call to check key types
Before there was only one key type supported, so we didn't need to query a key type. Now there is DSA, EC, and RSA, so there needs to be another argument. Bug: 10600582 Change-Id: I9fe9e46b9ec9cfb2f1246179b2c396216b2c1fdb
Diffstat (limited to 'core/java/android/security')
-rw-r--r--core/java/android/security/IKeystoreService.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/security/IKeystoreService.java b/core/java/android/security/IKeystoreService.java
index bf8d4e5..f8bf45b 100644
--- a/core/java/android/security/IKeystoreService.java
+++ b/core/java/android/security/IKeystoreService.java
@@ -444,12 +444,13 @@ public interface IKeystoreService extends IInterface {
}
@Override
- public int is_hardware_backed() throws RemoteException {
+ public int is_hardware_backed(String keyType) throws RemoteException {
Parcel _data = Parcel.obtain();
Parcel _reply = Parcel.obtain();
int _result;
try {
_data.writeInterfaceToken(DESCRIPTOR);
+ _data.writeString(keyType);
mRemote.transact(Stub.TRANSACTION_is_hardware_backed, _data, _reply, 0);
_reply.readException();
_result = _reply.readInt();
@@ -593,7 +594,7 @@ public interface IKeystoreService extends IInterface {
public int duplicate(String srcKey, int srcUid, String destKey, int destUid)
throws RemoteException;
- public int is_hardware_backed() throws RemoteException;
+ public int is_hardware_backed(String string) throws RemoteException;
public int clear_uid(long uid) throws RemoteException;
}