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

Commit 4a9263a2 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add Telecom debug setting for enabling enhanced call blocking." am:... 

Merge "Add Telecom debug setting for enabling enhanced call blocking." am: 727097a4 am: c0411e0b
am: b77daf6a

Change-Id: I1ae91c6e5dc605c32845e6412baf383e3299a9ff
parents 8093a406 b77daf6a

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -3699,6 +3699,14 @@ public final class Settings { 
        /** @hide */

        public static final Validator VIBRATE_WHEN_RINGING_VALIDATOR = BOOLEAN_VALIDATOR;



        /**

         * When {@code 1}, Telecom enhanced call blocking functionality is enabled.  When

         * {@code 0}, enhanced call blocking functionality is disabled.

         * @hide

         */

        public static final String DEBUG_ENABLE_ENHANCED_CALL_BLOCKING =

                "debug.enable_enhanced_calling";



        /**

         * Whether the audible DTMF tones are played by the dialer when dialing. The value is

         * boolean (1 or 0).

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ public class SettingsBackupTest { 
                    Settings.System.NOTIFICATION_LIGHT_PULSE, // candidate for backup?

                    Settings.System.NOTIFICATION_SOUND_CACHE, // internal cache

                    Settings.System.POINTER_LOCATION, // backup candidate?

                    Settings.System.DEBUG_ENABLE_ENHANCED_CALL_BLOCKING, // used for testing only

                    Settings.System.RINGTONE_CACHE, // internal cache

                    Settings.System.SETUP_WIZARD_HAS_RUN, // Only used by SuW

                    Settings.System.SHOW_GTALK_SERVICE_STATUS, // candidate for backup?