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

Commit 9a1967e1 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Some folks like sending null fields." into oc-dev

parents f3157e16 67c8c1e1

core/java/android/content/pm/ApplicationInfo.java

+10 −3
Original line number Diff line number Diff line
@@ -1203,7 +1203,12 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        dest.writeInt(requiresSmallestWidthDp);

        dest.writeInt(compatibleWidthLimitDp);

        dest.writeInt(largestWidthLimitDp);

        if (storageUuid != null) {

            dest.writeInt(1);

            dest.writeUuid(storageUuid);

        } else {

            dest.writeInt(0);

        }

        dest.writeString(scanSourceDir);

        dest.writeString(scanPublicSourceDir);

        dest.writeString(sourceDir);
@@ -1265,8 +1270,10 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        requiresSmallestWidthDp = source.readInt();

        compatibleWidthLimitDp = source.readInt();

        largestWidthLimitDp = source.readInt();

        if (source.readInt() != 0) {

            storageUuid = source.readUuid();

            volumeUuid = StorageManager.convert(storageUuid);

        }

        scanSourceDir = source.readString();

        scanPublicSourceDir = source.readString();

        sourceDir = source.readString();