summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-09-12 09:49:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-12 09:49:54 -0700
commit32aa0bfdd5984970e22da9676c5f59cc0bf9203e (patch)
tree0c3e35dacd61bc48d0be05de5fe6753d07b6badc /src/com
parent3117b93015ae35c20613c1647096033fb323395d (diff)
parentad54160844177515dfe9024521669e4b47311d0f (diff)
downloadpackages_apps_Settings-32aa0bfdd5984970e22da9676c5f59cc0bf9203e.zip
packages_apps_Settings-32aa0bfdd5984970e22da9676c5f59cc0bf9203e.tar.gz
packages_apps_Settings-32aa0bfdd5984970e22da9676c5f59cc0bf9203e.tar.bz2
am ad541608: am ad0f0edb: Merge "Call to equals() comparing different types"
* commit 'ad54160844177515dfe9024521669e4b47311d0f': Call to equals() comparing different types
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/DataUsageSummary.java4
1 files changed, 2 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;