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

am b4248495: am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev

Browse Source 
* commit 'b424849533ac369c41a824510a8f3914f62ed2c6':
  Bring along more ApplicationInfo fields.
This commit is contained in:
Jeff Sharkey
2014-10-09 13:16:31 +00:00
committed by Android Git Automerger
parent 52940c2bcf b424849533
commit 8a1df4154d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,6 +683,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
requiresSmallestWidthDp = orig.requiresSmallestWidthDp; requiresSmallestWidthDp = orig.requiresSmallestWidthDp;
compatibleWidthLimitDp = orig.compatibleWidthLimitDp; compatibleWidthLimitDp = orig.compatibleWidthLimitDp;
largestWidthLimitDp = orig.largestWidthLimitDp; largestWidthLimitDp = orig.largestWidthLimitDp;
scanSourceDir = orig.scanSourceDir;
scanPublicSourceDir = orig.scanPublicSourceDir;
sourceDir = orig.sourceDir; sourceDir = orig.sourceDir;
publicSourceDir = orig.publicSourceDir; publicSourceDir = orig.publicSourceDir;
splitSourceDirs = orig.splitSourceDirs; splitSourceDirs = orig.splitSourceDirs;
@@ -731,6 +733,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
dest.writeInt(requiresSmallestWidthDp); dest.writeInt(requiresSmallestWidthDp);
dest.writeInt(compatibleWidthLimitDp); dest.writeInt(compatibleWidthLimitDp);
dest.writeInt(largestWidthLimitDp); dest.writeInt(largestWidthLimitDp);
dest.writeString(scanSourceDir);
dest.writeString(scanPublicSourceDir);
dest.writeString(sourceDir); dest.writeString(sourceDir);
dest.writeString(publicSourceDir); dest.writeString(publicSourceDir);
dest.writeStringArray(splitSourceDirs); dest.writeStringArray(splitSourceDirs);
@@ -778,6 +782,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
requiresSmallestWidthDp = source.readInt(); requiresSmallestWidthDp = source.readInt();
compatibleWidthLimitDp = source.readInt(); compatibleWidthLimitDp = source.readInt();
largestWidthLimitDp = source.readInt(); largestWidthLimitDp = source.readInt();
scanSourceDir = source.readString();
scanPublicSourceDir = source.readString();
sourceDir = source.readString(); sourceDir = source.readString();
publicSourceDir = source.readString(); publicSourceDir = source.readString();
splitSourceDirs = source.readStringArray(); splitSourceDirs = source.readStringArray();