diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 3cbe1ea4879..481538d9a0a 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -21,6 +21,7 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.graphics.Typeface; +import android.net.ConnectivityManager; import android.net.NetworkTemplate; import android.os.Bundle; import android.text.Spannable; @@ -206,10 +207,12 @@ public class DataUsageSummaryPreference extends Preference { } } - private static void launchWifiDataUsage(Context context) { + @VisibleForTesting + static void launchWifiDataUsage(Context context) { final Bundle args = new Bundle(1); args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, NetworkTemplate.buildTemplateWifiWildcard()); + args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI); final SubSettingLauncher launcher = new SubSettingLauncher(context) .setArguments(args) .setDestination(DataUsageList.class.getName()) diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index ae11954d838..525b82e0194 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -26,6 +26,7 @@ import android.app.Activity; import android.content.ComponentName; import android.content.Intent; import android.graphics.Typeface; +import android.net.ConnectivityManager; import android.net.NetworkTemplate; import android.os.Bundle; import android.telephony.SubscriptionManager; @@ -531,6 +532,18 @@ public class DataUsageSummaryPreferenceTest { assertThat(mLaunchButton.isEnabled()).isFalse(); } + @Test + public void launchWifiDataUsage_shouldSetWifiNetworkTypeInIntentExtra() { + mSummaryPreference.launchWifiDataUsage(mActivity); + + final Intent launchIntent = Shadows.shadowOf(mActivity).getNextStartedActivity(); + final Bundle args = + launchIntent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS); + + assertThat(args.getInt(DataUsageList.EXTRA_NETWORK_TYPE)) + .isEqualTo(ConnectivityManager.TYPE_WIFI); + } + private void bindViewHolder() { mSummaryPreference.onBindViewHolder(mHolder); mUsageTitle = (TextView) mHolder.findViewById(R.id.usage_title);