diff options
| author | Kenny Root <kroot@google.com> | 2013-03-21 21:56:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-21 21:56:54 +0000 |
| commit | f6c4dba2d30ddba41ccfd6d9d2be2729ea496902 (patch) | |
| tree | b4449ba12d8e3da7e8c70edcd2b313f4798cd76c /core/java/android | |
| parent | e4679750c538e982bb81f4eea2343e8bede3e118 (diff) | |
| parent | 5f1d965f7d7e1df50981ffed8faa11fbcc17ca22 (diff) | |
Merge "KeyStore: change migrate to duplicate"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/security/IKeystoreService.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/java/android/security/IKeystoreService.java b/core/java/android/security/IKeystoreService.java index 2ae3c6415d20..a890d9bdcd84 100644 --- a/core/java/android/security/IKeystoreService.java +++ b/core/java/android/security/IKeystoreService.java @@ -407,15 +407,18 @@ public interface IKeystoreService extends IInterface { } @Override - public int migrate(String name, int targetUid) throws RemoteException { + public int duplicate(String srcKey, int srcUid, String destKey, int destUid) + throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; try { _data.writeInterfaceToken(DESCRIPTOR); - _data.writeString(name); - _data.writeInt(targetUid); - mRemote.transact(Stub.TRANSACTION_migrate, _data, _reply, 0); + _data.writeString(srcKey); + _data.writeInt(srcUid); + _data.writeString(destKey); + _data.writeInt(destUid); + mRemote.transact(Stub.TRANSACTION_duplicate, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); } finally { @@ -448,7 +451,7 @@ public interface IKeystoreService extends IInterface { static final int TRANSACTION_grant = IBinder.FIRST_CALL_TRANSACTION + 17; static final int TRANSACTION_ungrant = IBinder.FIRST_CALL_TRANSACTION + 18; static final int TRANSACTION_getmtime = IBinder.FIRST_CALL_TRANSACTION + 19; - static final int TRANSACTION_migrate = IBinder.FIRST_CALL_TRANSACTION + 20; + static final int TRANSACTION_duplicate = IBinder.FIRST_CALL_TRANSACTION + 20; /** * Cast an IBinder object into an IKeystoreService interface, generating @@ -534,5 +537,6 @@ public interface IKeystoreService extends IInterface { public long getmtime(String name) throws RemoteException; - public int migrate(String name, int targetUid) throws RemoteException; + public int duplicate(String srcKey, int srcUid, String destKey, int destUid) + throws RemoteException; } |