From 13a2423b7ecf82b369031e9b88c89bea6e7096d7 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Thu, 25 Nov 2010 22:50:38 -0500 Subject: Fix MVNO roaming setting, move to Secure. Change-Id: I18eaab33ea94efa0efff88350f137072b4841d92 --- core/java/android/provider/Settings.java | 9 +++++++-- .../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; -- cgit v1.1