commit 0bc5b93fe22b5e3c18b2edace37f3bb01d09934e
author Jeff Sharkey <jsharkey@android.com> Thu May 03 15:02:06 2012 -0700
committer Jeff Sharkey <jsharkey@android.com> Thu May 03 15:02:06 2012 -0700
tree 6ffd3f804b9437630de82c8d56e18e76395eb28c
parent a90015c2c9795479ce6f1896f443948d615fd0c5

Fall back to Wi-Fi data when SIM missing.

Bug: 6427657
Change-Id: I0613b4b89ddbea1cde2fd96ce6dd4bacb0fb4eaa

src/com/android/settings/DataUsageSummary.java

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 7d45461..1255b6b 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -278,6 +278,12 @@
         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 @@
             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 @@
             showEthernet.setChecked(mShowEthernet);
         } else {
             showEthernet.setVisible(false);
-            mShowEthernet = true;
         }
 
         final MenuItem metered = menu.findItem(R.id.data_usage_menu_metered);