Mark resource-only splits as hasCode=false.

PackageManagerService now skips dexopt for split APKs that don't
declare they have code.  Also surface more detailed error messages
in logs.

Bug: 14975160
Change-Id: Ie6078dba724815020cee59b7fc52317e88ca097a

1 files changed, 7 insertions, 3 deletions

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index d41cca6..43c2b15 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -846,7 +846,7 @@ public class PackageParser {
             throw e;
         } catch (Exception e) {
             throw new PackageParserException(INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION,
-                    "Unable to read AndroidManifest.xml of " + apkPath);
+                    "Failed to read manifest from " + apkPath, e);
         } finally {
             IoUtils.closeQuietly(parser);
             IoUtils.closeQuietly(assets);
@@ -895,7 +895,7 @@ public class PackageParser {
             throw e;
         } catch (Exception e) {
             throw new PackageParserException(INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION,
-                    "Unable to read AndroidManifest.xml of " + apkPath);
+                    "Failed to read manifest from " + apkPath, e);
         } finally {
             IoUtils.closeQuietly(parser);
             IoUtils.closeQuietly(assets);
@@ -910,9 +910,13 @@ public class PackageParser {
      * omitted here.
      */
     private Package parseSplitApk(Package pkg, Resources res, XmlResourceParser parser, int flags,
-            int splitIndex, String[] outError) throws XmlPullParserException, IOException {
+            int splitIndex, String[] outError) throws XmlPullParserException, IOException,
+            PackageParserException {
         AttributeSet attrs = parser;
 
+        // We parsed manifest tag earlier; just skip past it
+        parsePackageSplitNames(parser, attrs, flags);
+
         mParseInstrumentationArgs = null;
         mParseActivityArgs = null;
         mParseServiceArgs = null;