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

Merge "Move Ims related settings from global setting to subscription db."

Browse Source 
am: f2ebbd1356

Change-Id: Ifc49cccd9f9ce47585367a3f0802ced5df94140b
This commit is contained in:
Malcolm Chen
2018-01-03 19:52:36 +00:00
committed by android-build-merger
parent e35adbc4d2 f2ebbd1356
commit 5bf5c028f7
2 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,7 @@ import android.os.ResultReceiver;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech;
import android.telephony.SubscriptionManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AndroidException; import android.util.AndroidException;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -10077,8 +10078,12 @@ public final class Settings {
* <p> * <p>
* Type: int (0 for false, 1 for true) * Type: int (0 for false, 1 for true)
* @hide * @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#ENHANCED_4G_MODE_ENABLED}
* instead.
*/ */
public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled"; @Deprecated
public static final String ENHANCED_4G_MODE_ENABLED =
SubscriptionManager.ENHANCED_4G_MODE_ENABLED;
/** /**
* Whether VT (Video Telephony over IMS) is enabled * Whether VT (Video Telephony over IMS) is enabled
@@ -10086,8 +10091,10 @@ public final class Settings {
* Type: int (0 for false, 1 for true) * Type: int (0 for false, 1 for true)
* *
* @hide * @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#VT_IMS_ENABLED} instead.
*/ */
public static final String VT_IMS_ENABLED = "vt_ims_enabled"; @Deprecated
public static final String VT_IMS_ENABLED = SubscriptionManager.VT_IMS_ENABLED;
/** /**
* Whether WFC is enabled * Whether WFC is enabled
@@ -10095,8 +10102,10 @@ public final class Settings {
* Type: int (0 for false, 1 for true) * Type: int (0 for false, 1 for true)
* *
* @hide * @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_ENABLED} instead.
*/ */
public static final String WFC_IMS_ENABLED = "wfc_ims_enabled"; @Deprecated
public static final String WFC_IMS_ENABLED = SubscriptionManager.WFC_IMS_ENABLED;
/** /**
* WFC mode on home/non-roaming network. * WFC mode on home/non-roaming network.
@@ -10104,8 +10113,10 @@ public final class Settings {
* Type: int - 2=Wi-Fi preferred, 1=Cellular preferred, 0=Wi-Fi only * Type: int - 2=Wi-Fi preferred, 1=Cellular preferred, 0=Wi-Fi only
* *
* @hide * @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_MODE} instead.
*/ */
public static final String WFC_IMS_MODE = "wfc_ims_mode"; @Deprecated
public static final String WFC_IMS_MODE = SubscriptionManager.WFC_IMS_MODE;
/** /**
* WFC mode on roaming network. * WFC mode on roaming network.
@@ -10113,8 +10124,11 @@ public final class Settings {
* Type: int - see {@link #WFC_IMS_MODE} for values * Type: int - see {@link #WFC_IMS_MODE} for values
* *
* @hide * @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_ROAMING_MODE}
* instead.
*/ */
public static final String WFC_IMS_ROAMING_MODE = "wfc_ims_roaming_mode"; @Deprecated
public static final String WFC_IMS_ROAMING_MODE = SubscriptionManager.WFC_IMS_ROAMING_MODE;
/** /**
* Whether WFC roaming is enabled * Whether WFC roaming is enabled
@@ -10122,8 +10136,12 @@ public final class Settings {
* Type: int (0 for false, 1 for true) * Type: int (0 for false, 1 for true)
* *
* @hide * @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_ROAMING_ENABLED}
* instead
*/ */
public static final String WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_enabled"; @Deprecated
public static final String WFC_IMS_ROAMING_ENABLED =
SubscriptionManager.WFC_IMS_ROAMING_ENABLED;
/** /**
* Whether user can enable/disable LTE as a preferred network. A carrier might control * Whether user can enable/disable LTE as a preferred network. A carrier might control

36
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -360,6 +360,42 @@ public class SubscriptionManager {
*/ */
public static final String CB_OPT_OUT_DIALOG = "show_cmas_opt_out_dialog"; public static final String CB_OPT_OUT_DIALOG = "show_cmas_opt_out_dialog";
/**
* TelephonyProvider column name for enable Volte.
*@hide
*/
public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";
/**
* TelephonyProvider column name for enable VT (Video Telephony over IMS)
*@hide
*/
public static final String VT_IMS_ENABLED = "vt_ims_enabled";
/**
* TelephonyProvider column name for enable Wifi calling
*@hide
*/
public static final String WFC_IMS_ENABLED = "wfc_ims_enabled";
/**
* TelephonyProvider column name for Wifi calling mode
*@hide
*/
public static final String WFC_IMS_MODE = "wfc_ims_mode";
/**
* TelephonyProvider column name for Wifi calling mode in roaming
*@hide
*/
public static final String WFC_IMS_ROAMING_MODE = "wfc_ims_roaming_mode";
/**
* TelephonyProvider column name for enable Wifi calling in roaming
*@hide
*/
public static final String WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_enabled";
/** /**
* Broadcast Action: The user has changed one of the default subs related to * Broadcast Action: The user has changed one of the default subs related to
* data, phone calls, or sms</p> * data, phone calls, or sms</p>