Merge "Fix potential aapt crash when processing overlay."

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index 4067735dd165f3022891181176b380a06c9d3c5c..537ae5e7716b00675f321789288daf8e3ca4e0ef 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -412,6 +412,7 @@ int doDump(Bundle* bundle)
             }
             tree.restart();
             printXMLBlock(&tree);
             }
             tree.restart();
             printXMLBlock(&tree);

+            tree.uninit();

             delete asset;
             asset = NULL;
         }
             delete asset;
             asset = NULL;
         }


@@ -524,6 +525,8 @@ int doDump(Bundle* bundle)
             bool actWallpaperService = false;
             bool specCameraFeature = false;
             bool hasCameraPermission = false;
             bool actWallpaperService = false;
             bool specCameraFeature = false;
             bool hasCameraPermission = false;

+            bool specGpsFeature = false;
+            bool hasGpsPermission = false;

             int targetSdk = 0;
             int smallScreen = 1;
             int normalScreen = 1;
             int targetSdk = 0;
             int smallScreen = 1;
             int normalScreen = 1;


@@ -678,7 +681,7 @@ int doDump(Bundle* bundle)
                                 REQ_NAVIGATION_ATTR, NULL, 0);
                         int32_t reqFiveWayNav = getIntegerAttribute(tree,
                                 REQ_FIVE_WAY_NAV_ATTR, NULL, 0);
                                 REQ_NAVIGATION_ATTR, NULL, 0);
                         int32_t reqFiveWayNav = getIntegerAttribute(tree,
                                 REQ_FIVE_WAY_NAV_ATTR, NULL, 0);

-                        printf("uses-configuation:");
+                        printf("uses-configuration:");

                         if (reqTouchScreen != 0) {
                             printf(" reqTouchScreen='%d'", reqTouchScreen);
                         }
                         if (reqTouchScreen != 0) {
                             printf(" reqTouchScreen='%d'", reqTouchScreen);
                         }


@@ -718,6 +721,8 @@ int doDump(Bundle* bundle)
                                     REQUIRED_ATTR, NULL, 1);
                             if (name == "android.hardware.camera") {
                                 specCameraFeature = true;
                                     REQUIRED_ATTR, NULL, 1);
                             if (name == "android.hardware.camera") {
                                 specCameraFeature = true;

+                            } else if (name == "android.hardware.location.gps") {
+                                specGpsFeature = true;

                             }
                             printf("uses-feature%s:'%s'\n",
                                     req ? "" : "-not-required", name.string());
                             }
                             printf("uses-feature%s:'%s'\n",
                                     req ? "" : "-not-required", name.string());


@@ -733,6 +738,8 @@ int doDump(Bundle* bundle)
                         if (name != "" && error == "") {
                             if (name == "android.permission.CAMERA") {
                                 hasCameraPermission = true;
                         if (name != "" && error == "") {
                             if (name == "android.permission.CAMERA") {
                                 hasCameraPermission = true;

+                            } else if (name == "android.permission.ACCESS_FINE_LOCATION") {
+                                hasGpsPermission = true;

                             }
                             printf("uses-permission:'%s'\n", name.string());
                         } else {
                             }
                             printf("uses-permission:'%s'\n", name.string());
                         } else {


@@ -740,6 +747,15 @@ int doDump(Bundle* bundle)
                                     error.string());
                             goto bail;
                         }
                                     error.string());
                             goto bail;
                         }

+                    } else if (tag == "original-package") {
+                        String8 name = getAttribute(tree, NAME_ATTR, &error);
+                        if (name != "" && error == "") {
+                            printf("original-package:'%s'\n", name.string());
+                        } else {
+                            fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
+                                    error.string());
+                                goto bail;
+                        }

                     }
                 } else if (depth == 3 && withinApplication) {
                     withinActivity = false;
                     }
                 } else if (depth == 3 && withinApplication) {
                     withinActivity = false;


@@ -849,6 +865,14 @@ int doDump(Bundle* bundle)
                 printf("uses-feature:'android.hardware.camera.autofocus'\n");
             }
 
                 printf("uses-feature:'android.hardware.camera.autofocus'\n");
             }
 

+            if (!specGpsFeature && hasGpsPermission) {
+                // For applications that have not explicitly stated their
+                // GPS feature requirements, but have requested the "fine" (GPS)
+                // permission, we are going to give them compatibility treatment
+                // of requiring the equivalent to original android devices.
+                printf("uses-feature:'android.hardware.location.gps'\n");
+            }
+

             if (hasMainActivity) {
                 printf("main\n");
             }
             if (hasMainActivity) {
                 printf("main\n");
             }


@@ -1151,7 +1175,12 @@ int doPackage(Bundle* bundle)
 
     // Write out R.java constants
     if (assets->getPackage() == assets->getSymbolsPrivatePackage()) {
 
     // Write out R.java constants
     if (assets->getPackage() == assets->getSymbolsPrivatePackage()) {

-        err = writeResourceSymbols(bundle, assets, assets->getPackage(), true);
+        if (bundle->getCustomPackage() == NULL) {
+            err = writeResourceSymbols(bundle, assets, assets->getPackage(), true);
+        } else {
+            const String8 customPkg(bundle->getCustomPackage());
+            err = writeResourceSymbols(bundle, assets, customPkg, true);
+        }

         if (err < 0) {
             goto bail;
         }
         if (err < 0) {
             goto bail;
         }