summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-10-08 10:14:53 -0700
committerJeff Sharkey <jsharkey@android.com>2014-10-08 10:14:53 -0700
commit7f1a57a3e709b9e1fdb03a7a8af5f13859f7f1ad (patch)
tree38f239be15db51f74d6f09bf688b52cdbb4d0162 /core/java
parentfdbbed6090d47c5ebbf254dfda7a87ef154c8a2c (diff)
downloadframeworks_base-7f1a57a3e709b9e1fdb03a7a8af5f13859f7f1ad.zip
frameworks_base-7f1a57a3e709b9e1fdb03a7a8af5f13859f7f1ad.tar.gz
frameworks_base-7f1a57a3e709b9e1fdb03a7a8af5f13859f7f1ad.tar.bz2
Bring along more ApplicationInfo fields.
When we added scan paths, we forgot to bring them along through Parcel and copy constructor. Bug: 17900178 Change-Id: I0ee9374f909d375768045976fd88cee7431f7d4d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/pm/ApplicationInfo.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 548a0c9..e07edba 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -683,6 +683,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
requiresSmallestWidthDp = orig.requiresSmallestWidthDp;
compatibleWidthLimitDp = orig.compatibleWidthLimitDp;
largestWidthLimitDp = orig.largestWidthLimitDp;
+ scanSourceDir = orig.scanSourceDir;
+ scanPublicSourceDir = orig.scanPublicSourceDir;
sourceDir = orig.sourceDir;
publicSourceDir = orig.publicSourceDir;
splitSourceDirs = orig.splitSourceDirs;
@@ -731,6 +733,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
dest.writeInt(requiresSmallestWidthDp);
dest.writeInt(compatibleWidthLimitDp);
dest.writeInt(largestWidthLimitDp);
+ dest.writeString(scanSourceDir);
+ dest.writeString(scanPublicSourceDir);
dest.writeString(sourceDir);
dest.writeString(publicSourceDir);
dest.writeStringArray(splitSourceDirs);
@@ -778,6 +782,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
requiresSmallestWidthDp = source.readInt();
compatibleWidthLimitDp = source.readInt();
largestWidthLimitDp = source.readInt();
+ scanSourceDir = source.readString();
+ scanPublicSourceDir = source.readString();
sourceDir = source.readString();
publicSourceDir = source.readString();
splitSourceDirs = source.readStringArray();