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

Commit 67c8c1e1 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Some folks like sending null fields. 

Test: cts-tradefed run commandAndExit cts-dev -m CtsContentTestCases -t android.content.pm.cts.ComponentInfoTest
Bug: 37495524
Change-Id: I9040534d717ac70d580bd2a7f5488369ab7c3a47
parent 2b499e4e

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