From ffba3e7ac981bde0cafdb5bb9169bf9faa6cf82c Mon Sep 17 00:00:00 2001
From: Janis Danisevskis <jdanis@google.com>
Date: Thu, 24 Mar 2022 15:28:15 -0700
Subject: WrappedApplicationKey: Remove superfluous branch in deserialization.

The metadata field is written unconditionally and will be represented at
least by a -1 if it is null.

Bug: 210655898
Test: N/A
Change-Id: Iad85dbec916a2d51523b81b594b66b9518811d27
---
 .../android/security/keystore/recovery/WrappedApplicationKey.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/java/android/security/keystore/recovery/WrappedApplicationKey.java b/core/java/android/security/keystore/recovery/WrappedApplicationKey.java
index 0cb69a4da50f..61fd0416e3b2 100644
--- a/core/java/android/security/keystore/recovery/WrappedApplicationKey.java
+++ b/core/java/android/security/keystore/recovery/WrappedApplicationKey.java
@@ -167,10 +167,7 @@ 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();
-        }
+        mMetadata = in.createByteArray();
     }
 
     @Override
-- 
cgit v1.2.3-59-g8ed1b