PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f8db32d8: am 74fd506b: Merge "Enable Ethernet tab in data usage"

Browse Source 
* commit 'f8db32d8af46d1cb1a10cf9d49dde7ecd4ce507d':
  Enable Ethernet tab in data usage
This commit is contained in:
Jeff Sharkey
2013-03-20 10:23:33 -07:00
committed by Android Git Automerger
parent 9f5b49192d f8db32d8af
commit 58e18de759
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/DataUsageSummary.java
View File

@@ -277,13 +277,19 @@ public class DataUsageSummary extends Fragment {
mPolicyEditor = new NetworkPolicyEditor(mPolicyManager); mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
mPolicyEditor.read(); mPolicyEditor.read();
try {
mStatsSession = mStatsService.openSession();
} catch (RemoteException e) {
throw new RuntimeException(e);
}
mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, false); mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, false);
mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false); mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false);
// override preferences when no mobile radio // override preferences when no mobile radio
if (!hasReadyMobileRadio(context)) { if (!hasReadyMobileRadio(context)) {
mShowWifi = hasWifiRadio(context); mShowWifi = true;
mShowEthernet = hasEthernet(context); mShowEthernet = true;
} }
setHasOptionsMenu(true); setHasOptionsMenu(true);
@@ -298,12 +304,6 @@ public class DataUsageSummary extends Fragment {
mUidDetailProvider = new UidDetailProvider(context); mUidDetailProvider = new UidDetailProvider(context);
try {
mStatsSession = mStatsService.openSession();
} catch (RemoteException e) {
throw new RuntimeException(e);
}
mTabHost = (TabHost) view.findViewById(android.R.id.tabhost); mTabHost = (TabHost) view.findViewById(android.R.id.tabhost);
mTabsContainer = (ViewGroup) view.findViewById(R.id.tabs_container); mTabsContainer = (ViewGroup) view.findViewById(R.id.tabs_container);
mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs); mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);