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

Commit 98a02762 authored by Todd Kennedy's avatar Todd Kennedy Committed by Automerger Merge Worker
Browse files

Merge "Use the correct method to unparcel the property map" into sc-dev am: 25cca35d 

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

Change-Id: Iee20786f6f22a923f0673a285827cc64b5a82d3c
parents ea241bf7 25cca35d

core/java/android/content/pm/parsing/ParsingPackageImpl.java

+1 −2
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import com.android.internal.util.Parcelling.BuiltIn.ForInternedStringValueMap; 
import com.android.internal.util.Parcelling.BuiltIn.ForStringSet;



import java.security.PublicKey;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;

import java.util.List;
@@ -1346,7 +1345,7 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable { 
        this.gwpAsanMode = in.readInt();

        this.minExtensionVersions = in.readSparseIntArray();

        this.mBooleans = in.readLong();

        this.mProperties = in.createTypedArrayMap(Property.CREATOR);

        this.mProperties = in.readHashMap(boot);

        this.memtagMode = in.readInt();

        this.nativeHeapZeroInitialized = in.readInt();

        this.requestOptimizedExternalStorageAccess = sForBoolean.unparcel(in);