Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev

import android.telephony.TelephonyScanManager;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

    private NetworkScan mNetworkScan;

    private class NetworkScanMock extends NetworkScan {

        NetworkScanMock(int scanId, int subId) {

            super(scanId, subId);

        }

        @Override

        public void stopScan() {

            return;

        }

    }

    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mNetworkScanHelper = new NetworkScanHelper(mTelephonyManager,

                mNetworkScanCallback, mNetworkScanExecutor);

        mNetworkScan = spy(new NetworkScan(SCAN_ID, SUB_ID));

        mNetworkScan = spy(new NetworkScanMock(SCAN_ID, SUB_ID));

    }

    @Test

    }

    @Test

    @Ignore

    public void startNetworkScan_incrementalAndAbort_doStop() {

        doReturn(mNetworkScan).when(mTelephonyManager).requestNetworkScan(

                any(NetworkScanRequest.class), any(Executor.class),