Merge "Enable Ethernet tab in data usage" (74fd506b) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DataUsageSummary.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -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);