Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b183fdca: am 56396c7f: Merge "Track changes to the keystore binder API" into mnc-dev

Browse Source 
* commit 'b183fdca615e847ed03389905b0a30e30d9d37c5':
  Track changes to the keystore binder API
This commit is contained in:
Shawn Willden
2015-06-03 17:45:45 +00:00
committed by Android Git Automerger
parent 92515f0a7b b183fdca61
commit 68f17203b2
6 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/KeyStore.java
View File

@@ -496,9 +496,9 @@ public class KeyStore {
}
public OperationResult begin(String alias, int purpose, boolean pruneable,
KeymasterArguments args, byte[] entropy, KeymasterArguments outArgs) {
KeymasterArguments args, byte[] entropy) {
try {
return mBinder.begin(getToken(), alias, purpose, pruneable, args, entropy, outArgs);
return mBinder.begin(getToken(), alias, purpose, pruneable, args, entropy);
} catch (RemoteException e) {
Log.w(TAG, "Cannot connect to keystore", e);
return null;