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

am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev

Browse Source 
* commit '6f10d1c34efba28856fea162f1d193319cad2576':
  Adding new setting LTE_SERVICE_FORCED.
This commit is contained in:
Amit Mahajan
2014-11-19 17:57:39 +00:00
committed by Android Git Automerger
parent 34a2ee695d 6f10d1c34e
commit bb35bbf198
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6600,6 +6600,15 @@ public final class Settings {
*/ */
public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled"; public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";
/**
* Whether user can enable/disable LTE as a preferred network. A carrier might control
* this via gservices, OMA-DM, carrier app, etc.
* <p>
* Type: int (0 for false, 1 for true)
* @hide
*/
public static final String LTE_SERVICE_FORCED = "lte_service_forced";
/** /**
* Settings to backup. This is here so that it's in the same place as the settings * Settings to backup. This is here so that it's in the same place as the settings
* keys and easy to update. * keys and easy to update.

3
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -2620,8 +2620,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
// Set the preferred network mode to target desired value or Default // Set the preferred network mode to target desired value or Default
// value defined in RILConstants // value defined in RILConstants
int type; int type;
type = SystemProperties.getInt("ro.telephony.default_network", type = RILConstants.PREFERRED_NETWORK_MODE;
RILConstants.PREFERRED_NETWORK_MODE);
loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type); loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type);
// Set the preferred cdma subscription source to target desired value or default // Set the preferred cdma subscription source to target desired value or default

5
telephony/java/com/android/internal/telephony/RILConstants.java
View File

@@ -24,6 +24,8 @@ package com.android.internal.telephony;
* Also they should all probably be static final. * Also they should all probably be static final.
*/ */
import android.os.SystemProperties;
/** /**
* {@hide} * {@hide}
*/ */
@@ -86,7 +88,8 @@ public interface RILConstants {
int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */ int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */
int NETWORK_MODE_LTE_ONLY = 11; /* LTE Only mode. */ int NETWORK_MODE_LTE_ONLY = 11; /* LTE Only mode. */
int NETWORK_MODE_LTE_WCDMA = 12; /* LTE/WCDMA */ int NETWORK_MODE_LTE_WCDMA = 12; /* LTE/WCDMA */
int PREFERRED_NETWORK_MODE = NETWORK_MODE_WCDMA_PREF; int PREFERRED_NETWORK_MODE = SystemProperties.getInt("ro.telephony.default_network",
NETWORK_MODE_WCDMA_PREF);
int CDMA_CELL_BROADCAST_SMS_DISABLED = 1; int CDMA_CELL_BROADCAST_SMS_DISABLED = 1;
int CDMA_CELL_BROADCAST_SMS_ENABLED = 0; int CDMA_CELL_BROADCAST_SMS_ENABLED = 0;