diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2017-01-16 00:07:19 +0100 |
|---|---|---|
| committer | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-11 01:53:37 +0000 |
| commit | 68c7c446ca004c30b91ca1d2420b5961544dbc27 (patch) | |
| tree | 5add4320fc82b742f4f4467b76787ba42919d4dd | |
| parent | 985bca96b0fb130b2f2547ffe7e506bd46e92592 (diff) | |
| download | android_packages_providers_TelephonyProvider-68c7c446ca004c30b91ca1d2420b5961544dbc27.tar.gz android_packages_providers_TelephonyProvider-68c7c446ca004c30b91ca1d2420b5961544dbc27.tar.bz2 android_packages_providers_TelephonyProvider-68c7c446ca004c30b91ca1d2420b5961544dbc27.zip | |
telephony: Initialize USER_NETWORK_MODE with DEFAULT_NW_MODE
PREFERRED_NETWORK_MODE is equal to ro.telephony.default_network
if set, RILConstants.NETWORK_MODE_WCDMA_PREF otherwise. Therefore
its value can be incorrect and should not be used as default
user preference.
Change-Id: I47f65468e6dcc5dd71f5b4feb4baee7823d764e7
(cherry picked from commit f42955e268cec1ea617ec4adc6132149178fa4d5)
| -rw-r--r-- | src/com/android/providers/telephony/TelephonyProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index a0664a0..53d2bb3 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java @@ -265,7 +265,7 @@ public class TelephonyProvider extends ContentProvider + SubscriptionManager.DATA_ROAMING + " INTEGER DEFAULT " + SubscriptionManager.DATA_ROAMING_DEFAULT + "," + SubscriptionManager.MCC + " INTEGER DEFAULT 0," + SubscriptionManager.MNC + " INTEGER DEFAULT 0," - + SubscriptionManager.USER_NETWORK_MODE + " INTEGER DEFAULT " + RILConstants.PREFERRED_NETWORK_MODE + "," + + SubscriptionManager.USER_NETWORK_MODE + " INTEGER DEFAULT " + SubscriptionManager.DEFAULT_NW_MODE + "," + SubscriptionManager.CB_EXTREME_THREAT_ALERT + " INTEGER DEFAULT 1," + SubscriptionManager.CB_SEVERE_THREAT_ALERT + " INTEGER DEFAULT 1," + SubscriptionManager.CB_AMBER_ALERT + " INTEGER DEFAULT 1," @@ -682,7 +682,7 @@ public class TelephonyProvider extends ContentProvider // Try to update the siminfo table. It might not be there. db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN " + SubscriptionManager.USER_NETWORK_MODE - + " INTEGER DEFAULT " + RILConstants.PREFERRED_NETWORK_MODE + ";"); + + " INTEGER DEFAULT " + SubscriptionManager.DEFAULT_NW_MODE + ";"); } catch (SQLiteException e) { if (DBG) { log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " + |