diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/security/IKeystoreService.java | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/core/java/android/security/IKeystoreService.java b/core/java/android/security/IKeystoreService.java index f8a49e6..651693a 100644 --- a/core/java/android/security/IKeystoreService.java +++ b/core/java/android/security/IKeystoreService.java @@ -78,7 +78,7 @@ public interface IKeystoreService extends IInterface { return _result; } - public int insert(String name, byte[] item) throws RemoteException { + public int insert(String name, byte[] item, int uid) throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; @@ -86,6 +86,7 @@ public interface IKeystoreService extends IInterface { _data.writeInterfaceToken(DESCRIPTOR); _data.writeString(name); _data.writeByteArray(item); + _data.writeInt(uid); mRemote.transact(Stub.TRANSACTION_insert, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); @@ -96,13 +97,14 @@ public interface IKeystoreService extends IInterface { return _result; } - public int del(String name) throws RemoteException { + public int del(String name, int uid) throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; try { _data.writeInterfaceToken(DESCRIPTOR); _data.writeString(name); + _data.writeInt(uid); mRemote.transact(Stub.TRANSACTION_del, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); @@ -113,13 +115,14 @@ public interface IKeystoreService extends IInterface { return _result; } - public int exist(String name) throws RemoteException { + public int exist(String name, int uid) throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; try { _data.writeInterfaceToken(DESCRIPTOR); _data.writeString(name); + _data.writeInt(uid); mRemote.transact(Stub.TRANSACTION_exist, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); @@ -130,13 +133,14 @@ public interface IKeystoreService extends IInterface { return _result; } - public String[] saw(String name) throws RemoteException { + public String[] saw(String name, int uid) throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); String[] _result; try { _data.writeInterfaceToken(DESCRIPTOR); _data.writeString(name); + _data.writeInt(uid); mRemote.transact(Stub.TRANSACTION_saw, _data, _reply, 0); _reply.readException(); int size = _reply.readInt(); @@ -235,13 +239,14 @@ public interface IKeystoreService extends IInterface { return _result; } - public int generate(String name) throws RemoteException { + public int generate(String name, int uid) throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; try { _data.writeInterfaceToken(DESCRIPTOR); _data.writeString(name); + _data.writeInt(uid); mRemote.transact(Stub.TRANSACTION_generate, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); @@ -252,7 +257,7 @@ public interface IKeystoreService extends IInterface { return _result; } - public int import_key(String name, byte[] data) throws RemoteException { + public int import_key(String name, byte[] data, int uid) throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; @@ -260,6 +265,7 @@ public interface IKeystoreService extends IInterface { _data.writeInterfaceToken(DESCRIPTOR); _data.writeString(name); _data.writeByteArray(data); + _data.writeInt(uid); mRemote.transact(Stub.TRANSACTION_import, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); @@ -324,13 +330,14 @@ public interface IKeystoreService extends IInterface { return _result; } - public int del_key(String name) throws RemoteException { + public int del_key(String name, int uid) throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; try { _data.writeInterfaceToken(DESCRIPTOR); _data.writeString(name); + _data.writeInt(uid); mRemote.transact(Stub.TRANSACTION_del_key, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); @@ -467,13 +474,13 @@ public interface IKeystoreService extends IInterface { public byte[] get(String name) throws RemoteException; - public int insert(String name, byte[] item) throws RemoteException; + public int insert(String name, byte[] item, int uid) throws RemoteException; - public int del(String name) throws RemoteException; + public int del(String name, int uid) throws RemoteException; - public int exist(String name) throws RemoteException; + public int exist(String name, int uid) throws RemoteException; - public String[] saw(String name) throws RemoteException; + public String[] saw(String name, int uid) throws RemoteException; public int reset() throws RemoteException; @@ -485,9 +492,9 @@ public interface IKeystoreService extends IInterface { public int zero() throws RemoteException; - public int generate(String name) throws RemoteException; + public int generate(String name, int uid) throws RemoteException; - public int import_key(String name, byte[] data) throws RemoteException; + public int import_key(String name, byte[] data, int uid) throws RemoteException; public byte[] sign(String name, byte[] data) throws RemoteException; @@ -495,7 +502,7 @@ public interface IKeystoreService extends IInterface { public byte[] get_pubkey(String name) throws RemoteException; - public int del_key(String name) throws RemoteException; + public int del_key(String name, int uid) throws RemoteException; public int grant(String name, int granteeUid) throws RemoteException; |