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

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

Change-Id: I585e033f4392d070134a1aee58d414f98e3fc017
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:37:29 +00:00
committed by Automerger Merge Worker
parent d1ca6ed04a 2e6b40a883
commit 2efefc72f6
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,10 +167,7 @@ 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. mMetadata = in.createByteArray();
if (in.dataAvail() > 0) {
mMetadata = in.createByteArray();
}
} }
@Override @Override