Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Call Screening]Default call screening app setting storage."

Browse Source 
am: 371786f6b0

Change-Id: I160ec6075473d818f89f4cffbce65648500c92a3
This commit is contained in:
Tony Zhu
2018-10-29 20:37:06 -07:00
committed by android-build-merger
parent 34662c81ca 371786f6b0
commit 56b75cb498
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Settings.java
View File

@@ -7298,6 +7298,14 @@ public final class Settings {
@UnsupportedAppUsage @UnsupportedAppUsage
public static final String DIALER_DEFAULT_APPLICATION = "dialer_default_application"; 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 * Specifies the package name currently configured to be the default application to perform
* the user-defined call redirection service with Telecom. * the user-defined call redirection service with Telecom.

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -530,6 +530,7 @@ public class SettingsBackupTest {
Settings.Secure.BACKUP_PROVISIONED, Settings.Secure.BACKUP_PROVISIONED,
Settings.Secure.BACKUP_TRANSPORT, Settings.Secure.BACKUP_TRANSPORT,
Settings.Secure.CALL_REDIRECTION_DEFAULT_APPLICATION, Settings.Secure.CALL_REDIRECTION_DEFAULT_APPLICATION,
Settings.Secure.CALL_SCREENING_DEFAULT_COMPONENT,
Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, // Candidate for backup? Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, // Candidate for backup?
Settings.Secure.CARRIER_APPS_HANDLED, Settings.Secure.CARRIER_APPS_HANDLED,
Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG, Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG,