From 0bc5b93fe22b5e3c18b2edace37f3bb01d09934e Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 3 May 2012 15:02:06 -0700 Subject: [PATCH] Fall back to Wi-Fi data when SIM missing. Bug: 6427657 Change-Id: I0613b4b89ddbea1cde2fd96ce6dd4bacb0fb4eaa --- src/com/android/settings/DataUsageSummary.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index 7d45461935..1255b6bcf7 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -278,6 +278,12 @@ public class DataUsageSummary extends Fragment { mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, false); mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false); + // override preferences when no mobile radio + if (!hasReadyMobileRadio(context)) { + mShowWifi = hasWifiRadio(context); + mShowEthernet = hasEthernet(context); + } + setHasOptionsMenu(true); } @@ -461,7 +467,6 @@ public class DataUsageSummary extends Fragment { showWifi.setChecked(mShowWifi); } else { showWifi.setVisible(false); - mShowWifi = true; } final MenuItem showEthernet = menu.findItem(R.id.data_usage_menu_show_ethernet); @@ -470,7 +475,6 @@ public class DataUsageSummary extends Fragment { showEthernet.setChecked(mShowEthernet); } else { showEthernet.setVisible(false); - mShowEthernet = true; } final MenuItem metered = menu.findItem(R.id.data_usage_menu_metered); -- 2.11.0