From 522974d2fb186775bd7d370af836cb7f7bf6956a Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Wed, 15 Jan 2014 15:57:32 -0800 Subject: [PATCH 1/2] releax wait timeout on start of dumpstate service Bug: 12181612 Change-Id: If7ae97de1e42890dac37d036ead669ccda65e688 --- cmds/bugreport/bugreport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds/bugreport/bugreport.c b/cmds/bugreport/bugreport.c index 4a0b51147..11e9057fe 100644 --- a/cmds/bugreport/bugreport.c +++ b/cmds/bugreport/bugreport.c @@ -29,7 +29,7 @@ int main(int argc, char *argv[]) { property_set("ctl.start", "dumpstate"); /* socket will not be available until service starts */ - for (i = 0; i < 10; i++) { + for (i = 0; i < 20; i++) { s = socket_local_client("dumpstate", ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM); From fa873602081b3f65dd27be328752f4f133c73beb Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Thu, 30 Jan 2014 13:14:01 -0800 Subject: [PATCH 2/2] frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default Bug: 12798969 Change-Id: I6b40317eceb3d89b0acff88238a9a9ab423c4d78 --- cmds/installd/commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index e9d6b159f..6fed798e1 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -669,7 +669,7 @@ int dexopt(const char *apk_path, uid_t uid, int is_public) ALOGV("dalvik.vm.dexopt_flags=%s\n", dexopt_flags); /* 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"); + property_get("persist.sys.dalvik.vm.lib.1", 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.