diff options
| author | Arne Coucheron <arco68@gmail.com> | 2017-02-09 00:12:04 +0000 |
|---|---|---|
| committer | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-11 01:53:47 +0000 |
| commit | d5e182367a279d407c5b72d4f0ad978c8558d4f8 (patch) | |
| tree | d63464daa6f2d880d86c47bc73941a8694d806e0 | |
| parent | 68c7c446ca004c30b91ca1d2420b5961544dbc27 (diff) | |
| download | android_packages_providers_TelephonyProvider-staging/cm-14.1-cafrebase.tar.gz android_packages_providers_TelephonyProvider-staging/cm-14.1-cafrebase.tar.bz2 android_packages_providers_TelephonyProvider-staging/cm-14.1-cafrebase.zip | |
Revert "telephony: Initialize USER_NETWORK_MODE with DEFAULT_NW_MODE"staging/cm-14.1-cafrebase
This reverts commit f42955e268cec1ea617ec4adc6132149178fa4d5.
Change-Id: I92163e9ada92ecc2d9024edfddd9e99fe580f304
(cherry picked from commit 9484d1581074d142e781388c37b24df059538c0d)
| -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 53d2bb3..a0664a0 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 " + SubscriptionManager.DEFAULT_NW_MODE + "," + + SubscriptionManager.USER_NETWORK_MODE + " INTEGER DEFAULT " + RILConstants.PREFERRED_NETWORK_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 " + SubscriptionManager.DEFAULT_NW_MODE + ";"); + + " INTEGER DEFAULT " + RILConstants.PREFERRED_NETWORK_MODE + ";"); } catch (SQLiteException e) { if (DBG) { log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " + |