Commit d5caa553 authored Mar 25, 2022 by Automerger Merge Worker

Merge "Merge "WrappedApplicationKey: Remove superfluous branch in...

Merge "Merge "WrappedApplicationKey: Remove superfluous branch in deserialization." am: 2e6b40a8 am: 2efefc72 am: f464e50d" into tm-dev am: a4b25400

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

Change-Id: Ia80bb78f9bfbf107c809f1923a09b4b6d4d8ec5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/security/keystore/recovery/WrappedApplicationKey.java

+1 −4

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

		@Override
		public int describeContents() {