diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-11-25 22:50:38 -0500 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-11-25 22:58:02 -0500 |
| commit | 13a2423b7ecf82b369031e9b88c89bea6e7096d7 (patch) | |
| tree | 33f9c33ff04b5329115531958f92a5325d644afc | |
| parent | 305bf62f59935f2743df497fb9524ac18b69fec5 (diff) | |
| download | frameworks_base-13a2423b7ecf82b369031e9b88c89bea6e7096d7.zip frameworks_base-13a2423b7ecf82b369031e9b88c89bea6e7096d7.tar.gz frameworks_base-13a2423b7ecf82b369031e9b88c89bea6e7096d7.tar.bz2 | |
Fix MVNO roaming setting, move to Secure.
Change-Id: I18eaab33ea94efa0efff88350f137072b4841d92
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index cc5b515..56f6a98 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2672,7 +2672,6 @@ public final class Settings { public static final String WIFI_WATCHDOG_PING_TIMEOUT_MS = Secure.WIFI_WATCHDOG_PING_TIMEOUT_MS; - public static final String BUTTON_MVNO_ROAMING_KEY = "button_mvno_roaming_key"; } /** @@ -4148,7 +4147,13 @@ public final class Settings { * @hide */ public static final String KILL_APP_LONGPRESS_BACK = "kill_app_on_longpress_back"; - + + /** + * Virtual network roaming + * @hide + */ + public static final String MVNO_ROAMING = "button_mvno_roaming_key"; + /** * @hide */ diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 9940fa8..36de23b 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -1289,7 +1289,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { boolean mvnoRoaming = Settings.System.getInt( phone.getContext().getContentResolver(), - Settings.System.BUTTON_MVNO_ROAMING_KEY, 0) == 1; + Settings.Secure.MVNO_ROAMING, 0) == 1; String spn; |