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

Merge "WrappedApplicationKey: Remove superfluous branch in deserialization." am: 2e6b40a883 am: 2efefc72f6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043164

Change-Id: Iab76c4a84c254cad256437d3324bf82169ed8b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-03-25 00:55:38 +00:00
committed by Automerger Merge Worker
parent 86a6fc7f04 2efefc72f6
commit f464e50dab
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/security/keystore/recovery/WrappedApplicationKey.java
View File

@@ -167,11 +167,8 @@ public final class WrappedApplicationKey implements Parcelable {
protected WrappedApplicationKey(Parcel in) { protected WrappedApplicationKey(Parcel in) {
mAlias = in.readString(); mAlias = in.readString();
mEncryptedKeyMaterial = in.createByteArray(); mEncryptedKeyMaterial = in.createByteArray();
// Check if there is still data to be read.
if (in.dataAvail() > 0) {
mMetadata = in.createByteArray(); mMetadata = in.createByteArray();
} }
}
@Override @Override
public int describeContents() { public int describeContents() {