summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author sqian <shuoq@google.com> 2018-10-09 11:36:25 -0700
committer android-build-merger <android-build-merger@google.com> 2018-10-09 11:36:25 -0700
commit936791f53680ed91d624e4c66530f0cb32d9c386 (patch)
tree4785a8dad5567cf938ec9321142e63acf46aac6d
parentf1aadaf8c5c1216049310f56c9f361ba107475da (diff)
parentb7c0727c156f710266f33092d3b49c6781df0b6d (diff)
Merge "Add Call Redirection Default Application in Settings"
am: b7c0727c15 Change-Id: Iae885868a4e985822eac0e4134b16224ee8237f6
-rw-r--r--core/java/android/provider/Settings.java9
-rw-r--r--core/tests/coretests/src/android/provider/SettingsBackupTest.java1
2 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 14465a73553c..584350f5b567 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7299,6 +7299,15 @@ public final class Settings {
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
*
* @see android.telephony.TelephonyManager#ACTION_EMERGENCY_ASSISTANCE
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 8d44c0326cc4..e62dbeabd8a9 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/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,