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

Commit a51294bc authored by Tony Zhu's avatar Tony Zhu Committed by android-build-merger
Browse files

Merge "[Call Screening]Default call screening app setting storage." am: 371786f6 am: 56b75cb4 

am: 5b3b0ea4

Change-Id: I32d514581e8fa9403d8412d2cd23fef41860d075
parents c015880f 5b3b0ea4

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -7387,6 +7387,14 @@ public final class Settings { 
        @UnsupportedAppUsage

        public static final String DIALER_DEFAULT_APPLICATION = "dialer_default_application";













        /**













         * Specifies the component name currently configured to be the default call screening













         * application













         * @hide













         */













        public static final String CALL_SCREENING_DEFAULT_COMPONENT =













                "call_screening_default_component";



























        /**















         * Specifies the package name currently configured to be the default application to perform















         * the user-defined call redirection service with Telecom.

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -547,6 +547,7 @@ public class SettingsBackupTest {













                 Settings.Secure.BACKUP_PROVISIONED,















                 Settings.Secure.BACKUP_TRANSPORT,















                 Settings.Secure.CALL_REDIRECTION_DEFAULT_APPLICATION,













                 Settings.Secure.CALL_SCREENING_DEFAULT_COMPONENT,















                 Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, // Candidate for backup?















                 Settings.Secure.CARRIER_APPS_HANDLED,















                 Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG,