summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2009-05-14 22:26:35 -0700
committerJaikumar Ganesh <jaikumar@google.com>2009-05-19 17:29:42 -0700
commitee748d37b01b3affb72b701d95ba20c189887b5f (patch)
treef097d1562c8b121607503e0f0176bd63102e30c6 /packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
parent83a6ec600259d245b799a99a8e963704db031a63 (diff)
downloadframeworks_base-ee748d37b01b3affb72b701d95ba20c189887b5f.zip
frameworks_base-ee748d37b01b3affb72b701d95ba20c189887b5f.tar.gz
frameworks_base-ee748d37b01b3affb72b701d95ba20c189887b5f.tar.bz2
Fix network preference getting incorrectly set.
When the phone process crashes, we set the network preference incorrectly. Also read the default value from a system property.
Diffstat (limited to 'packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 8df65f9..f6958ed 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -659,8 +659,9 @@ class DatabaseHelper extends SQLiteOpenHelper {
}
// Set the preferred network mode to 0 = Global, CDMA default
- loadSetting(stmt, Settings.Secure.PREFERRED_NETWORK_MODE,
+ int type = SystemProperties.getInt("ro.telephony.default_network",
RILConstants.PREFERRED_NETWORK_MODE);
+ loadSetting(stmt, Settings.Secure.PREFERRED_NETWORK_MODE, type);
// Enable or disable Cell Broadcast SMS
loadSetting(stmt, Settings.Secure.CDMA_CELL_BROADCAST_SMS,
@@ -706,4 +707,3 @@ class DatabaseHelper extends SQLiteOpenHelper {
Float.toString(mContext.getResources().getFraction(resid, base, base)));
}
}
-