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

Commit fa779317 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Settings: Remove unused USE_PTP_INTERFACE setting"

parents 922261de 1324f22d

core/java/android/provider/Settings.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -1767,12 +1767,6 @@ public final class Settings { 
         */

         */

        public static final String UNLOCK_SOUND = "unlock_sound";

        public static final String UNLOCK_SOUND = "unlock_sound";





        /**

         * True if we should appear as a PTP device instead of MTP.

         * @hide

         */

        public static final String USE_PTP_INTERFACE = "use_ptp_interface";



        /**

        /**

         * Receive incoming SIP calls?

         * Receive incoming SIP calls?

         * 0 = no

         * 0 = no
@@ -1879,7 +1873,6 @@ public final class Settings { 
            LOCKSCREEN_SOUNDS_ENABLED,

            LOCKSCREEN_SOUNDS_ENABLED,

            SHOW_WEB_SUGGESTIONS,

            SHOW_WEB_SUGGESTIONS,

            NOTIFICATION_LIGHT_PULSE,

            NOTIFICATION_LIGHT_PULSE,

            USE_PTP_INTERFACE,

            SIP_CALL_OPTIONS,

            SIP_CALL_OPTIONS,

            SIP_RECEIVE_CALLS,

            SIP_RECEIVE_CALLS,

            POINTER_SPEED,

            POINTER_SPEED,

packages/SettingsProvider/res/values/defaults.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -77,8 +77,6 @@ 
    <!-- Default for Settings.System.VIBRATE_IN_SILENT -->

    <!-- Default for Settings.System.VIBRATE_IN_SILENT -->

    <bool name="def_vibrate_in_silent">true</bool>

    <bool name="def_vibrate_in_silent">true</bool>





    <bool name="def_use_ptp_interface">false</bool>



    <!-- Default for Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION -->

    <!-- Default for Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION -->

    <bool name="def_accessibility_script_injection">false</bool>

    <bool name="def_accessibility_script_injection">false</bool>

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -1209,9 +1209,6 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,

            loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,

                    R.bool.def_vibrate_in_silent);

                    R.bool.def_vibrate_in_silent);





            loadBooleanSetting(stmt, Settings.System.USE_PTP_INTERFACE,

                    R.bool.def_use_ptp_interface);



            // Set notification volume to follow ringer volume by default

            // Set notification volume to follow ringer volume by default

            loadBooleanSetting(stmt, Settings.System.NOTIFICATIONS_USE_RING_VOLUME,

            loadBooleanSetting(stmt, Settings.System.NOTIFICATIONS_USE_RING_VOLUME,

                    R.bool.def_notifications_use_ring_volume);

                    R.bool.def_notifications_use_ring_volume);