Merge "WrappedApplicationKey: Remove superfluous branch in deserialization."

2022-03-25 00:16:25 +00:00
parent d25623ae62 ffba3e7ac9
commit 2e6b40a883
1 changed files with 1 additions and 4 deletions
--- 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