diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-09-02 08:39:35 -0700 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2014-09-02 08:39:35 -0700 |
| commit | 2c830a2905b07639984499529f9a19aeb779a539 (patch) | |
| tree | c3713b0d451693b5d6e7bea94eead3491f2733ad /core/java/android/provider | |
| parent | 56d3cb3013f06e3fd3f99a63d071dc0a72c92af9 (diff) | |
| download | frameworks_base-2c830a2905b07639984499529f9a19aeb779a539.zip frameworks_base-2c830a2905b07639984499529f9a19aeb779a539.tar.gz frameworks_base-2c830a2905b07639984499529f9a19aeb779a539.tar.bz2 | |
Remove "ask each time" SIP call setting. (1/2)
1. Removed setting from Settings.System class.
2. Added settings database migration step to change "SIP_ASK_ME_EACH_TIME"
to "SIP_ADDRESS_ONLY" as the "ask me each time" option no longer makes
sense given the new phone accounts settings.
Bug: 17321422
Change-Id: I3df1be4fcda44f2097c49af44508ac1fce72a24b
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 33e0468..f93f5d3 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2561,7 +2561,6 @@ public final class Settings { * Call Preference String. * "SIP_ALWAYS" : Always use SIP with network access * "SIP_ADDRESS_ONLY" : Only if destination is a SIP address - * "SIP_ASK_ME_EACH_TIME" : Always ask me each time * @hide */ public static final String SIP_CALL_OPTIONS = "sip_call_options"; @@ -2579,9 +2578,13 @@ public final class Settings { public static final String SIP_ADDRESS_ONLY = "SIP_ADDRESS_ONLY"; /** - * One of the sip call options: Always ask me each time. + * @deprecated Use SIP_ALWAYS or SIP_ADDRESS_ONLY instead. Formerly used to indicate that + * the user should be prompted each time a call is made whether it should be placed using + * SIP. The {@link com.android.providers.settings.DatabaseHelper} replaces this with + * SIP_ADDRESS_ONLY. * @hide */ + @Deprecated public static final String SIP_ASK_ME_EACH_TIME = "SIP_ASK_ME_EACH_TIME"; /** |