diff options
| author | Kenny Root <kroot@google.com> | 2013-03-21 16:07:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-21 16:07:11 -0700 |
| commit | e37478c4ebbe6e95ef3904b9f2fa0e93e1b258ac (patch) | |
| tree | 67283a16d7d176eb569abda66d7a4d91bf89228f /keystore/java/android/security/KeyStore.java | |
| parent | 116e56cdf4bf408bfa3e7f70efc325a2a9f4010b (diff) | |
| parent | 9d262c49d96de4d896594bfcf00ece873f1abb7f (diff) | |
| download | frameworks_base-e37478c4ebbe6e95ef3904b9f2fa0e93e1b258ac.zip frameworks_base-e37478c4ebbe6e95ef3904b9f2fa0e93e1b258ac.tar.gz frameworks_base-e37478c4ebbe6e95ef3904b9f2fa0e93e1b258ac.tar.bz2 | |
am 9d262c49: am f6c4dba2: Merge "KeyStore: change migrate to duplicate"
* commit '9d262c49d96de4d896594bfcf00ece873f1abb7f':
KeyStore: change migrate to duplicate
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 4dc0beb..12c0ed8 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -287,9 +287,9 @@ public class KeyStore { } } - public boolean migrate(String key, int uid) { + public boolean duplicate(String srcKey, int srcUid, String destKey, int destUid) { try { - return mBinder.migrate(key, uid) == NO_ERROR; + return mBinder.duplicate(srcKey, srcUid, destKey, destUid) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; |