commit 5b4350f22f81662436992504e711e462de7a790f
author Jeff Sharkey <jsharkey@android.com> Thu Feb 06 22:25:30 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 06 22:25:30 2014 +0000
tree a810502e463064536817afd00a0e39a2e1ed1d92
parent f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4
parent f3a9578910050d35fd536c1f9a7b5d629b3c19d8

Merge "Fix memory leak in ManageApplication"

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index f3a22ca..d971bd2 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -94,7 +94,7 @@
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
     private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
     private static final String SELECT_RUNTIME_KEY = "select_runtime";
-    private static final String SELECT_RUNTIME_PROPERTY = "persist.sys.dalvik.vm.lib";
+    private static final String SELECT_RUNTIME_PROPERTY = "persist.sys.dalvik.vm.lib.1";
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
     private static final String HDCP_CHECKING_KEY = "hdcp_checking";
     private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";

src/com/android/settings/DreamSettings.java

diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 1c8f988..cb91f39 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -206,6 +206,7 @@
                     public void onClick(DialogInterface dialog, int item) {
                         mBackend.setActivatedOnDock(item == 0 || item == 2);
                         mBackend.setActivatedOnSleep(item == 1 || item == 2);
+                        dialog.dismiss();
                     }
                 })
                 .create();