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

Commit 238be024 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev

parents 4e4cdeff 3bc8aaad

src/com/android/settings/DevelopmentSettings.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -99,7 +99,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
    private static final String KEEP_SCREEN_ON = "keep_screen_on";

    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 BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";

    private static final String SELECT_RUNTIME_KEY = "select_runtime";

    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 ALLOW_MOCK_LOCATION = "allow_mock_location";

    private static final String HDCP_CHECKING_KEY = "hdcp_checking";

    private static final String HDCP_CHECKING_KEY = "hdcp_checking";

    private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";

    private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";