From ffce9c1e9aaaf48b56c40b52fd6b2f80d416ffb2 Mon Sep 17 00:00:00 2001 From: Jaewan Kim Date: Tue, 19 Mar 2013 16:53:45 +0900 Subject: [PATCH] Enable Ethernet tab in data usage mStateSession is not initialized at the time hasEthernet is called to set mShowEthernet, so Ethernet tab is not shown at the startup. In this case, if the device doesn't support mobile network, user cannot even select it from the context menu. Bug: 8365419 Change-Id: I441971f18346c34a3adf3f18d9355075d9dce3f0 --- src/com/android/settings/DataUsageSummary.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index ae67d3a1c9d..963f864cfc4 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -277,13 +277,19 @@ public class DataUsageSummary extends Fragment { mPolicyEditor = new NetworkPolicyEditor(mPolicyManager); mPolicyEditor.read(); + try { + mStatsSession = mStatsService.openSession(); + } catch (RemoteException e) { + throw new RuntimeException(e); + } + 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); + mShowWifi = true; + mShowEthernet = true; } setHasOptionsMenu(true); @@ -298,12 +304,6 @@ public class DataUsageSummary extends Fragment { mUidDetailProvider = new UidDetailProvider(context); - try { - mStatsSession = mStatsService.openSession(); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - mTabHost = (TabHost) view.findViewById(android.R.id.tabhost); mTabsContainer = (ViewGroup) view.findViewById(R.id.tabs_container); mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);