Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3542909 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 2ce0dcda: am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart" 

* commit '2ce0dcda':
  Move to dalvik.vm.lib.2 to force default to libart
parents a8e1e7c9 2ce0dcda

src/com/android/settings/DevelopmentSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
    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.1";

    private static final String SELECT_RUNTIME_PROPERTY = "persist.sys.dalvik.vm.lib.2";

    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";