| commit | 2e6b40a8839a470cc6e69e8efee4ec16fe61acac | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 25 00:16:25 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Mar 25 00:16:25 2022 +0000 |
| tree | 732ee051261c1d6164495fea65dfbbe3dc7ad01d | |
| parent | d25623ae62663fc032e863b847c2a045d55a70b8 [diff] | |
| parent | ffba3e7ac981bde0cafdb5bb9169bf9faa6cf82c [diff] |
Merge "WrappedApplicationKey: Remove superfluous branch in deserialization."
diff --git a/core/java/android/security/keystore/recovery/WrappedApplicationKey.java b/core/java/android/security/keystore/recovery/WrappedApplicationKey.java index 0cb69a4..61fd041 100644 --- a/core/java/android/security/keystore/recovery/WrappedApplicationKey.java +++ b/core/java/android/security/keystore/recovery/WrappedApplicationKey.java
@@ -167,10 +167,7 @@ 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