commit 562262cc89838529316ff2f3e511c0d876b08677
author Jeff Sharkey <jsharkey@android.com> Wed Oct 08 17:25:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 08 17:25:39 2014 +0000
tree 446a07652d51a2279294b9ccad196ce3cf296716
parent f121892bc8c73b06086f8ebc059dd86f680b5197
parent 7f1a57a3e709b9e1fdb03a7a8af5f13859f7f1ad

Merge "Bring along more ApplicationInfo fields." into lmp-dev

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

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 @@
         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 @@
         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 @@
         requiresSmallestWidthDp = source.readInt();
         compatibleWidthLimitDp = source.readInt();
         largestWidthLimitDp = source.readInt();
+        scanSourceDir = source.readString();
+        scanPublicSourceDir = source.readString();
         sourceDir = source.readString();
         publicSourceDir = source.readString();
         splitSourceDirs = source.readStringArray();