commit bb7272f137ad3558bba5ee3a31dcfe4f41cc797f
author Mathias Agopian <mathias@google.com> Wed Jul 10 23:10:58 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 10 23:10:58 2013 +0000
tree 82b6b0634484ca46ea6608edaba07843b7b43b10
parent e7a8b17e37ef359567fbbd9beb8c2445494f6402
parent 6b44267a3beb457e220cad0666c039d3a765cdb2

Merge "fix SF buffer cropping"

cmds/dumpstate/dumpstate.c

diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index 37d4646..38b0b24 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -284,8 +284,7 @@
     run_command("CHECKIN BATTERYSTATS", 30, "dumpsys", "batterystats", "--checkin", NULL);
     run_command("CHECKIN MEMINFO", 30, "dumpsys", "meminfo", "--checkin", NULL);
     run_command("CHECKIN NETSTATS", 30, "dumpsys", "netstats", "--checkin", NULL);
-    run_command("CHECKIN PROCSTATS", 30, "dumpsys", "procstats", "-c",
-            "--include-committed", NULL);
+    run_command("CHECKIN PROCSTATS", 30, "dumpsys", "procstats", "-c", NULL);
     run_command("CHECKIN USAGESTATS", 30, "dumpsys", "usagestats", "--c", NULL);
 
     printf("========================================================\n");

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 131e03f..27580f3 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -656,7 +656,7 @@
     struct stat apk_stat, dex_stat;
     char out_path[PKG_PATH_MAX];
     char dexopt_flags[PROPERTY_VALUE_MAX];
-    char dalvik_vm_lib[PROPERTY_VALUE_MAX];
+    char persist_sys_dalvik_vm_lib[PROPERTY_VALUE_MAX];
     char *end;
     int res, zip_fd=-1, out_fd=-1;
 
@@ -668,9 +668,8 @@
     property_get("dalvik.vm.dexopt-flags", dexopt_flags, "");
     ALOGV("dalvik.vm.dexopt_flags=%s\n", dexopt_flags);
 
-    /* The command to run depend ones the value of dalvik.vm.lib */
-    property_get("dalvik.vm.lib", dalvik_vm_lib, "libdvm.so");
-    ALOGV("dalvik.vm.lib=%s\n", dalvik_vm_lib);
+    /* The command to run depend ones the value of persist.sys.dalvik.vm.lib */
+    property_get("persist.sys.dalvik.vm.lib", persist_sys_dalvik_vm_lib, "libdvm.so");
 
     /* Before anything else: is there a .odex file?  If so, we have
      * precompiled the apk and there is nothing to do here.
@@ -739,12 +738,12 @@
             exit(67);
         }
 
-        if (strncmp(dalvik_vm_lib, "libdvm", 6) == 0) {
+        if (strncmp(persist_sys_dalvik_vm_lib, "libdvm", 6) == 0) {
             run_dexopt(zip_fd, out_fd, apk_path, out_path, dexopt_flags);
-        } else if (strncmp(dalvik_vm_lib, "libart", 6) == 0) {
+        } else if (strncmp(persist_sys_dalvik_vm_lib, "libart", 6) == 0) {
             run_dex2oat(zip_fd, out_fd, apk_path, out_path, dexopt_flags);
         } else {
-            exit(69);   /* Unexpected dalvik.vm.lib value */
+            exit(69);   /* Unexpected persist.sys.dalvik.vm.lib value */
         }
         exit(68);   /* only get here on exec failure */
     } else {