From 857572a8eda319c4b12b542f351cc4e5798c5af9 Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Wed, 2 Sep 2015 13:53:19 -0700 Subject: TelephonyProvider: change default user nw mode to invalid We should not assume a default user mode because each device sim may want a different mode (and the property does not handle this). Ref: CYNGNOS-291, CYNGNOS-893 Change-Id: Ib67cfd1ffc27910c1ecb52ae4250a3c950c5b7c6 Signed-off-by: Roman Birg --- src/com/android/providers/telephony/TelephonyProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index 770def0..5d7e321 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java @@ -209,7 +209,7 @@ public class TelephonyProvider extends ContentProvider + SubscriptionManager.MNC + " INTEGER DEFAULT 0" + "," + SubscriptionManager.SUB_STATE + " INTEGER DEFAULT " + SubscriptionManager.ACTIVE + "," + SubscriptionManager.NETWORK_MODE+ " INTEGER DEFAULT " + SubscriptionManager.DEFAULT_NW_MODE + "," - + SubscriptionManager.USER_NETWORK_MODE+ " INTEGER DEFAULT " + RILConstants.PREFERRED_NETWORK_MODE + + SubscriptionManager.USER_NETWORK_MODE+ " INTEGER DEFAULT " + SubscriptionManager.DEFAULT_NW_MODE + ");"); if (DBG) log("dbh.createSimInfoTable:-"); } @@ -494,7 +494,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. " + -- cgit v1.2.3