Merge "Add the new option for the scripted monkey profile testing." into gingerbread
diff --git a/sdk_overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/sdk_overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 0d211a8..c4a990e 100644
--- a/sdk_overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/sdk_overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -17,5 +17,8 @@
*/
-->
<resources>
+ <!-- The SDK builds do not talk to a remote backend, and enabling by
+ default makes for the best developer experience. -->
+ <bool name="def_backup_enabled">true</bool>
<string name="def_backup_transport">android/com.android.internal.backup.LocalTransport</string>
</resources>
diff --git a/simulator/app/PropertyServer.cpp b/simulator/app/PropertyServer.cpp
index eb1bfc3..4a0a2ac 100644
--- a/simulator/app/PropertyServer.cpp
+++ b/simulator/app/PropertyServer.cpp
@@ -112,6 +112,10 @@
{ "ro.HOME_APP_MEM", "4096" },
{ "ro.BACKUP_APP_ADJ", "2" },
{ "ro.BACKUP_APP_MEM", "4096" },
+ { "ro.PERCEPTIBLE_APP_ADJ", "2" },
+ { "ro.PERCEPTIBLE_APP_MEM", "4096" },
+ { "ro.HEAVY_WEIGHT_APP_ADJ", "3" },
+ { "ro.HEAVY_WEIGHT_APP_MEM", "4096" },
//{ "init.svc.adbd", "running" }, // causes ADB-JDWP
{ "init.svc.usbd", "running" },
{ "init.svc.debuggerd", "running" },