Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9a1967e157

Change-Id: I90ea9660add142eb9286791134103f346f155add
This commit is contained in:
Jeff Sharkey
2017-04-19 20:19:28 +00:00
committed by android-build-merger
parent 39b5ad8411 9a1967e157
commit 218c2135b6
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -1203,7 +1203,12 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
dest.writeInt(requiresSmallestWidthDp);
dest.writeInt(compatibleWidthLimitDp);
dest.writeInt(largestWidthLimitDp);
dest.writeUuid(storageUuid);
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();
storageUuid = source.readUuid();
volumeUuid = StorageManager.convert(storageUuid);
if (source.readInt() != 0) {
storageUuid = source.readUuid();
volumeUuid = StorageManager.convert(storageUuid);
}
scanSourceDir = source.readString();
scanPublicSourceDir = source.readString();
sourceDir = source.readString();