diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-09-02 17:31:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-02 17:31:39 +0000 |
| commit | 4b7498d81fd6bd44eeb77a05d7c3ceccf155ea01 (patch) | |
| tree | 94209135405905b59f0dc3d41e4c269d0010d429 /core/java/android/provider | |
| parent | 76a65d5f00679e3a4f40c9509213c49990d60a1c (diff) | |
| parent | 2c830a2905b07639984499529f9a19aeb779a539 (diff) | |
| download | frameworks_base-4b7498d81fd6bd44eeb77a05d7c3ceccf155ea01.zip frameworks_base-4b7498d81fd6bd44eeb77a05d7c3ceccf155ea01.tar.gz frameworks_base-4b7498d81fd6bd44eeb77a05d7c3ceccf155ea01.tar.bz2 | |
Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
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 e5c89fc..f4c2dc8 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2566,7 +2566,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"; @@ -2584,9 +2583,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"; /** |