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

Commit a83f6943 authored by Sangyun Yun's avatar Sangyun Yun Committed by Android (Google) Code Review
Browse files

Merge "Rename API requestValidation to requestNetworkValidation" into main

parents 5e6fb6da 36030dbd

src/java/com/android/internal/telephony/data/DataNetwork.java

+1 −1
Original line number Diff line number Diff line
@@ -3578,7 +3578,7 @@ public class DataNetwork extends StateMachine { 
        mNetworkValidationResultCodeCallback = resultCodeCallback;



        // Request validation directly from the data service.

        mDataServiceManagers.get(mTransport).requestValidation(

        mDataServiceManagers.get(mTransport).requestNetworkValidation(

                mCid.get(mTransport), obtainMessage(EVENT_DATA_NETWORK_VALIDATION_RESPONSE));

        log("handleDataNetworkValidationRequest, network validation requested");

    }

src/java/com/android/internal/telephony/data/DataServiceManager.java

+4 −4
Original line number Diff line number Diff line
@@ -959,8 +959,8 @@ public class DataServiceManager extends Handler { 
     * @param onCompleteMessage The result message for this request. Null if the client does not

     * care about the result.

     */

    public void requestValidation(int cid, @Nullable Message onCompleteMessage) {

        if (DBG) log("requestValidation");

    public void requestNetworkValidation(int cid, @Nullable Message onCompleteMessage) {

        if (DBG) log("requestNetworkValidation");

        if (!mBound) {

            loge("DataService is not bound.");

            sendCompleteMessage(onCompleteMessage, DataServiceCallback.RESULT_ERROR_ILLEGAL_STATE);
@@ -978,9 +978,9 @@ public class DataServiceManager extends Handler { 
            mMessageMap.put(callback.asBinder(), onCompleteMessage);

        }

        try {

            mIDataService.requestValidation(mPhone.getPhoneId(), cid, callback);

            mIDataService.requestNetworkValidation(mPhone.getPhoneId(), cid, callback);

        } catch (RemoteException e) {

            loge("Cannot invoke requestValidation on data service.");

            loge("Cannot invoke requestNetworkValidation on data service.");

            if (callback != null) {

                mMessageMap.remove(callback.asBinder());

            }

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java

+3 −3
Original line number Diff line number Diff line
@@ -2028,13 +2028,13 @@ public class DataNetworkTest extends TelephonyTest { 
        // First Request

        mDataNetworkUT.requestNetworkValidation(mIntegerConsumer);

        processAllMessages();

        verify(mMockedWlanDataServiceManager).requestValidation(eq(123 /*cid*/),

        verify(mMockedWlanDataServiceManager).requestNetworkValidation(eq(123 /*cid*/),

                any(Message.class));



        // Duplicate Request

        mDataNetworkUT.requestNetworkValidation(mIntegerConsumer);

        processAllMessages();

        verify(mMockedWlanDataServiceManager).requestValidation(eq(123 /*cid*/),

        verify(mMockedWlanDataServiceManager).requestNetworkValidation(eq(123 /*cid*/),

                any(Message.class));

        assertThat(waitForIntegerConsumerResponse(1 /*numOfEvents*/)).isTrue();

        assertThat(mIntegerConsumerResult).isEqualTo(DataServiceCallback.RESULT_ERROR_BUSY);
@@ -2107,7 +2107,7 @@ public class DataNetworkTest extends TelephonyTest { 
        // Request Network Validation

        mDataNetworkUT.requestNetworkValidation(mIntegerConsumer);

        processAllMessages();

        verify(mMockedWlanDataServiceManager).requestValidation(eq(123 /*cid*/),

        verify(mMockedWlanDataServiceManager).requestNetworkValidation(eq(123 /*cid*/),

                any(Message.class));



        // data state updated with network validation status

tests/telephonytests/src/com/android/internal/telephony/data/DataServiceManagerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -269,18 +269,18 @@ public class DataServiceManagerTest extends TelephonyTest { 
    }



    @Test

    public void testRequestValidation_ServiceNotBound() throws Exception {

    public void testRequestNetworkValidation_ServiceNotBound() throws Exception {

        createDataServiceManager(false);

        Message message = mHandler.obtainMessage(1234);

        mDataServiceManagerUT.requestValidation(123, message);

        mDataServiceManagerUT.requestNetworkValidation(123, message);

        waitAndVerifyResult(message, DataServiceCallback.RESULT_ERROR_ILLEGAL_STATE);

    }



    @Test

    public void testRequestValidation_ServiceBound() throws Exception {

    public void testRequestNetworkValidation_ServiceBound() throws Exception {

        createDataServiceManager(true);

        Message message = mHandler.obtainMessage(1234);

        mDataServiceManagerUT.requestValidation(123, message);

        mDataServiceManagerUT.requestNetworkValidation(123, message);

        waitAndVerifyResult(message, DataServiceCallback.RESULT_ERROR_UNSUPPORTED);

    }

}