diff options
Diffstat (limited to 'src/com/android')
4 files changed, 15 insertions, 15 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java index 4a66cdf96..8b8ff4016 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java @@ -157,9 +157,9 @@ public class CellBroadcastConfigService extends IntentService { try { SubscriptionManager subManager = SubscriptionManager.from(getApplicationContext()); - int subId = SubscriptionManager.getDefaultSmsSubId(); + int subId = SubscriptionManager.getDefaultSmsSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { - subId = SubscriptionManager.getDefaultSubId(); + subId = SubscriptionManager.getDefaultSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID && subManager != null) { int [] subIds = subManager.getActiveSubscriptionIdList(); @@ -285,15 +285,15 @@ public class CellBroadcastConfigService extends IntentService { // Current Israel requires enable certain CMAS messages ids. // Todo: Move this to CarrierConfig later. boolean supportIsraelPwsAlerts = (COUNTRY_ISRAEL.equals(tm.getSimCountryIso(subId)) - || COUNTRY_ISRAEL.equals(tm.getNetworkCountryIsoForSubscription(subId))); + || COUNTRY_ISRAEL.equals(tm.getNetworkCountryIso(subId))); boolean supportTaiwanPwsAlerts = (COUNTRY_TAIWAN.equals(tm.getSimCountryIso(subId)) - || COUNTRY_TAIWAN.equals(tm.getNetworkCountryIsoForSubscription(subId))); + || COUNTRY_TAIWAN.equals(tm.getNetworkCountryIso(subId))); // Per Taiwan PWS regulatory requirement, table 8, we need to enable CMAS additional // language support. We can add more countries here as they require it in the future. boolean supportAdditionalLanguage = (COUNTRY_TAIWAN.equals(tm.getSimCountryIso(subId)) - || COUNTRY_TAIWAN.equals(tm.getNetworkCountryIsoForSubscription(subId))); + || COUNTRY_TAIWAN.equals(tm.getNetworkCountryIso(subId))); if (DBG) { log("enableEmergencyAlerts = " + enableEmergencyAlerts); diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java index c4481edb3..2aa042a09 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java @@ -197,9 +197,9 @@ public class CellBroadcastReceiver extends BroadcastReceiver { static boolean phoneIsCdma() { boolean isCdma = false; - int subId = SubscriptionManager.getDefaultSmsSubId(); + int subId = SubscriptionManager.getDefaultSmsSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { - subId = SubscriptionManager.getDefaultSubId(); + subId = SubscriptionManager.getDefaultSubscriptionId(); } try { diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java index e3968bcd4..853653755 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java @@ -135,9 +135,9 @@ public class CellBroadcastSearchIndexableProvider extends SearchIndexablesProvid TelephonyManager tm = (TelephonyManager) getContext().getSystemService( Context.TELEPHONY_SERVICE); - int subId = SubscriptionManager.getDefaultSmsSubId(); + int subId = SubscriptionManager.getDefaultSmsSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { - subId = SubscriptionManager.getDefaultSubId(); + subId = SubscriptionManager.getDefaultSubscriptionId(); } boolean enableChannel50Support = res.getBoolean(R.bool.show_brazil_settings) || diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java index 2536e47d8..b60b77e76 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java @@ -269,9 +269,9 @@ public class CellBroadcastSettings extends PreferenceActivity { TelephonyManager tm = (TelephonyManager) getActivity().getSystemService( Context.TELEPHONY_SERVICE); - int subId = SubscriptionManager.getDefaultSmsSubId(); + int subId = SubscriptionManager.getDefaultSmsSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { - subId = SubscriptionManager.getDefaultSubId(); + subId = SubscriptionManager.getDefaultSubscriptionId(); } boolean enableChannel50Support = res.getBoolean(R.bool.show_brazil_settings) || @@ -315,9 +315,9 @@ public class CellBroadcastSettings extends PreferenceActivity { return false; } - int subId = SubscriptionManager.getDefaultSmsSubId(); + int subId = SubscriptionManager.getDefaultSmsSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { - subId = SubscriptionManager.getDefaultSubId(); + subId = SubscriptionManager.getDefaultSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) return false; } @@ -346,9 +346,9 @@ public class CellBroadcastSettings extends PreferenceActivity { return false; } - int subId = SubscriptionManager.getDefaultSmsSubId(); + int subId = SubscriptionManager.getDefaultSmsSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { - subId = SubscriptionManager.getDefaultSubId(); + subId = SubscriptionManager.getDefaultSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) return false; } |