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

Commit 846b2d19 authored by sqian's avatar sqian Committed by android-build-merger
Browse files

Merge "Add Call Redirection Default Application in Settings" am: b7c0727c 

am: 936791f5

Change-Id: Ibf6554de156ec0e4d7fa9dc46eb8eee216857188
parents ca7411c0 936791f5

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -7300,6 +7300,15 @@ public final class Settings { 
        @UnsupportedAppUsage

        public static final String DIALER_DEFAULT_APPLICATION = "dialer_default_application";













        /**













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













         * the user-defined call redirection service with Telecom.













         * @hide













         */













        @UnsupportedAppUsage













        public static final String CALL_REDIRECTION_DEFAULT_APPLICATION =













                "call_redirection_default_application";



























        /**















         * Specifies the package name currently configured to be the emergency assistance application















         *

































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



+1
−0




























Original line number
Diff line number
Diff line








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













                 Settings.Secure.BACKUP_ENABLED,















                 Settings.Secure.BACKUP_PROVISIONED,















                 Settings.Secure.BACKUP_TRANSPORT,













                 Settings.Secure.CALL_REDIRECTION_DEFAULT_APPLICATION,















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















                 Settings.Secure.CARRIER_APPS_HANDLED,















                 Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG,