Merge "Add Call Redirection Default Application in Settings"

am: b7c0727c15

Change-Id: Iae885868a4e985822eac0e4134b16224ee8237f6

core/java/android/provider/Settings.java

@@ -7298,6 +7298,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

@@ -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,