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

Merge "Include operation handle in OperationResult"

Browse Source
This commit is contained in:
Chad Brubaker
2015-03-31 17:49:15 +00:00
committed by Gerrit Code Review
parent d052a3d37b 4cd8e50690
commit 5491ea9e5b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/security/keymaster/OperationResult.java
View File

@@ -30,6 +30,7 @@ import java.util.List;
public class OperationResult implements Parcelable { public class OperationResult implements Parcelable {
public final int resultCode; public final int resultCode;
public final IBinder token; public final IBinder token;
public final long operationHandle;
public final int inputConsumed; public final int inputConsumed;
public final byte[] output; public final byte[] output;
@@ -47,6 +48,7 @@ public class OperationResult implements Parcelable {
protected OperationResult(Parcel in) { protected OperationResult(Parcel in) {
resultCode = in.readInt(); resultCode = in.readInt();
token = in.readStrongBinder(); token = in.readStrongBinder();
operationHandle = in.readLong();
inputConsumed = in.readInt(); inputConsumed = in.readInt();
output = in.createByteArray(); output = in.createByteArray();
} }
@@ -60,6 +62,7 @@ public class OperationResult implements Parcelable {
public void writeToParcel(Parcel out, int flags) { public void writeToParcel(Parcel out, int flags) {
out.writeInt(resultCode); out.writeInt(resultCode);
out.writeStrongBinder(token); out.writeStrongBinder(token);
out.writeLong(operationHandle);
out.writeInt(inputConsumed); out.writeInt(inputConsumed);
out.writeByteArray(output); out.writeByteArray(output);
} }