Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c72d371 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Clean up unused EXTRA_NETWORK_TYPE" into main

parents 2d7ef101 de83cdcd

src/com/android/settings/datausage/DataUsageList.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ import android.app.Activity; 
import android.app.settings.SettingsEnums;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.net.ConnectivityManager;

import android.net.NetworkPolicy;

import android.net.NetworkPolicy;

import android.net.NetworkTemplate;

import android.net.NetworkTemplate;

import android.os.Bundle;

import android.os.Bundle;
@@ -62,7 +61,6 @@ public class DataUsageList extends DataUsageBaseFragment 




    static final String EXTRA_SUB_ID = "sub_id";

    static final String EXTRA_SUB_ID = "sub_id";

    static final String EXTRA_NETWORK_TEMPLATE = "network_template";

    static final String EXTRA_NETWORK_TEMPLATE = "network_template";

    static final String EXTRA_NETWORK_TYPE = "network_type";





    private static final String TAG = "DataUsageList";

    private static final String TAG = "DataUsageList";

    private static final boolean LOGD = false;

    private static final boolean LOGD = false;
@@ -83,8 +81,6 @@ public class DataUsageList extends DataUsageBaseFragment 
    @VisibleForTesting

    @VisibleForTesting

    int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    @VisibleForTesting

    @VisibleForTesting

    int mNetworkType;

    @VisibleForTesting

    LoadingViewController mLoadingViewController;

    LoadingViewController mLoadingViewController;





    private ChartDataUsagePreference mChart;

    private ChartDataUsagePreference mChart;
@@ -205,7 +201,6 @@ public class DataUsageList extends DataUsageBaseFragment 
        if (args != null) {

        if (args != null) {

            mSubId = args.getInt(EXTRA_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);

            mSubId = args.getInt(EXTRA_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);

            mTemplate = args.getParcelable(EXTRA_NETWORK_TEMPLATE);

            mTemplate = args.getParcelable(EXTRA_NETWORK_TEMPLATE);

            mNetworkType = args.getInt(EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_MOBILE);

        }

        }

        if (mTemplate == null && mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

        if (mTemplate == null && mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            final Intent intent = getIntent();

            final Intent intent = getIntent();

src/com/android/settings/datausage/DataUsagePreference.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ import android.app.settings.SettingsEnums; 
import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.net.ConnectivityManager;

import android.net.NetworkTemplate;

import android.net.NetworkTemplate;

import android.os.Bundle;

import android.os.Bundle;

import android.util.AttributeSet;

import android.util.AttributeSet;
@@ -78,9 +77,6 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc 
        final SubSettingLauncher launcher;

        final SubSettingLauncher launcher;

        args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);

        args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);

        args.putInt(DataUsageList.EXTRA_SUB_ID, mSubId);

        args.putInt(DataUsageList.EXTRA_SUB_ID, mSubId);

        args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, mTemplate.getMatchRule()

                == NetworkTemplate.MATCH_MOBILE

                ? ConnectivityManager.TYPE_MOBILE : ConnectivityManager.TYPE_WIFI);

        launcher = new SubSettingLauncher(getContext())

        launcher = new SubSettingLauncher(getContext())

            .setArguments(args)

            .setArguments(args)

            .setDestination(DataUsageList.class.getName())

            .setDestination(DataUsageList.class.getName())

tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java

+0 −13
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ import static org.mockito.Mockito.when; 




import android.app.Activity;

import android.app.Activity;

import android.content.Intent;

import android.content.Intent;

import android.net.ConnectivityManager;

import android.net.NetworkTemplate;

import android.net.NetworkTemplate;

import android.os.Bundle;

import android.os.Bundle;

import android.os.UserManager;

import android.os.UserManager;
@@ -176,18 +175,6 @@ public class DataUsageListTest { 
        assertThat(mDataUsageList.mSubId).isEqualTo(3);

        assertThat(mDataUsageList.mSubId).isEqualTo(3);

    }

    }





    @Test

    public void processArgument_shouldGetNetworkTypeFromArgument() {

        final Bundle args = new Bundle();

        args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI);

        args.putInt(DataUsageList.EXTRA_SUB_ID, 3);

        mDataUsageList.setArguments(args);



        mDataUsageList.processArgument();



        assertThat(mDataUsageList.mNetworkType).isEqualTo(ConnectivityManager.TYPE_WIFI);

    }



    @Test

    @Test

    public void processArgument_fromIntent_shouldGetTemplateFromIntent() {

    public void processArgument_fromIntent_shouldGetTemplateFromIntent() {

        final Intent intent = new Intent();

        final Intent intent = new Intent();