diff options
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/DataUsageSummary.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/TetherSettings.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index a0b18fd..db1ae29 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -1188,8 +1188,8 @@ public class DataUsageSummary extends Fragment { final String rangePhrase = formatDateRange(context, start, end); final int summaryRes; - if (TAB_MOBILE.equals(mCurrentTab) || TAB_3G.equals(mCurrentApp) - || TAB_4G.equals(mCurrentApp)) { + if (TAB_MOBILE.equals(mCurrentTab) || TAB_3G.equals(mCurrentTab) + || TAB_4G.equals(mCurrentTab)) { summaryRes = R.string.data_usage_total_during_range_mobile; } else { summaryRes = R.string.data_usage_total_during_range; diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index f0b6b44..4e0933d 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -387,6 +387,8 @@ public class TetherSettings extends SettingsPreferenceFragment } BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); + if (adapter == null) + return; int btState = adapter.getState(); if (btState == BluetoothAdapter.STATE_TURNING_OFF) { mBluetoothTether.setEnabled(false); |