Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ac55ec6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "WrappedApplicationKey: Remove superfluous branch in deserialization." am: 2e6b40a8 am: 2efefc72 am: f464e50d

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



Change-Id: I4ebdf4b33b738f5078a55b870a6f2ee5fc67e682
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83f718f8 f464e50d

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() {