diff options
| author | Kenny Root <kroot@google.com> | 2013-02-13 23:43:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-13 23:43:57 +0000 |
| commit | b0f4b8a7d2662e8cc63dae1001175bf72bca1539 (patch) | |
| tree | 90ec01d90d588d952f3c5d068f932a0e91b51559 /keystore/java | |
| parent | 8ab767786a3b59c72b613f84d40b181428327ac1 (diff) | |
| parent | e151f281d527f4bea5cbdf4219d5e0507a6668b0 (diff) | |
| download | frameworks_base-b0f4b8a7d2662e8cc63dae1001175bf72bca1539.zip frameworks_base-b0f4b8a7d2662e8cc63dae1001175bf72bca1539.tar.gz frameworks_base-b0f4b8a7d2662e8cc63dae1001175bf72bca1539.tar.bz2 | |
Merge "Track keystore binder changes"
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index ceaff37..9dd2b0d 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -85,7 +85,7 @@ public class KeyStore { public boolean put(String key, byte[] value) { try { - return mBinder.insert(key, value) == NO_ERROR; + return mBinder.insert(key, value, -1) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; @@ -94,7 +94,7 @@ public class KeyStore { public boolean delete(String key) { try { - return mBinder.del(key) == NO_ERROR; + return mBinder.del(key, -1) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; @@ -103,7 +103,7 @@ public class KeyStore { public boolean contains(String key) { try { - return mBinder.exist(key) == NO_ERROR; + return mBinder.exist(key, -1) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; @@ -112,7 +112,7 @@ public class KeyStore { public String[] saw(String prefix) { try { - return mBinder.saw(prefix); + return mBinder.saw(prefix, -1); } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return null; @@ -167,7 +167,7 @@ public class KeyStore { public boolean generate(String key) { try { - return mBinder.generate(key) == NO_ERROR; + return mBinder.generate(key, -1) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; @@ -176,7 +176,7 @@ public class KeyStore { public boolean importKey(String keyName, byte[] key) { try { - return mBinder.import_key(keyName, key) == NO_ERROR; + return mBinder.import_key(keyName, key, -1) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; @@ -194,7 +194,7 @@ public class KeyStore { public boolean delKey(String key) { try { - return mBinder.del_key(key) == NO_ERROR; + return mBinder.del_key(key, -1) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; |