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

Commit 92615d2c 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 104d8fb1 0d562a3f

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15136,7 +15136,7 @@ package android.telephony.data { 
    method public final void notifyDataCallListChanged(java.util.List<android.telephony.data.DataCallResponse>);

    method public final void notifyDataProfileUnthrottled(@NonNull android.telephony.data.DataProfile);

    method public void requestDataCallList(@NonNull android.telephony.data.DataServiceCallback);

    method @FlaggedApi("com.android.internal.telephony.flags.network_validation") public void requestValidation(int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @FlaggedApi("com.android.internal.telephony.flags.network_validation") public void requestNetworkValidation(int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method public void setDataProfile(@NonNull java.util.List<android.telephony.data.DataProfile>, boolean, @NonNull android.telephony.data.DataServiceCallback);

    method public void setInitialAttachApn(@NonNull android.telephony.data.DataProfile, boolean, @NonNull android.telephony.data.DataServiceCallback);

    method public void setupDataCall(int, @NonNull android.telephony.data.DataProfile, boolean, boolean, int, @Nullable android.net.LinkProperties, @NonNull android.telephony.data.DataServiceCallback);

telephony/java/android/telephony/data/DataCallResponse.java

+2 −2
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ public final class DataCallResponse implements Parcelable { 


    /**

     * Return the network validation status that was initiated by {@link

     * DataService.DataServiceProvider#requestValidation}

     * DataService.DataServiceProvider#requestNetworkValidation}

     *

     * @return The network validation status of data connection.

     */
@@ -931,7 +931,7 @@ public final class DataCallResponse implements Parcelable { 


        /**

         * Set the network validation status that corresponds to the state of the network validation

         * request started by {@link DataService.DataServiceProvider#requestValidation}

         * request started by {@link DataService.DataServiceProvider#requestNetworkValidation}

         *

         * @param status The network validation status.

         * @return The same instance of the builder.

telephony/java/android/telephony/data/DataService.java

+6 −5
Original line number Diff line number Diff line
@@ -415,13 +415,13 @@ public abstract class DataService extends Service { 
         *     request validation to the DataService and checks if the request has been submitted.

         */

        @FlaggedApi(Flags.FLAG_NETWORK_VALIDATION)

        public void requestValidation(int cid,

        public void requestNetworkValidation(int cid,

                @NonNull @CallbackExecutor Executor executor,

                @NonNull @DataServiceCallback.ResultCode Consumer<Integer> resultCodeCallback) {

            Objects.requireNonNull(executor, "executor cannot be null");

            Objects.requireNonNull(resultCodeCallback, "resultCodeCallback cannot be null");



            Log.d(TAG, "requestValidation: " + cid);

            Log.d(TAG, "requestNetworkValidation: " + cid);



            // The default implementation is to return unsupported.

            executor.execute(() -> resultCodeCallback
@@ -741,7 +741,7 @@ public abstract class DataService extends Service { 
                case DATA_SERVICE_REQUEST_VALIDATION:

                    if (serviceProvider == null) break;

                    ValidationRequest validationRequest = (ValidationRequest) message.obj;

                    serviceProvider.requestValidation(

                    serviceProvider.requestNetworkValidation(

                            validationRequest.cid,

                            validationRequest.executor,

                            FunctionalUtils
@@ -924,9 +924,10 @@ public abstract class DataService extends Service { 
        }



        @Override

        public void requestValidation(int slotIndex, int cid, IIntegerConsumer resultCodeCallback) {

        public void requestNetworkValidation(int slotIndex, int cid,

                IIntegerConsumer resultCodeCallback) {

            if (resultCodeCallback == null) {

                loge("requestValidation: resultCodeCallback is null");

                loge("requestNetworkValidation: resultCodeCallback is null");

                return;

            }

            ValidationRequest validationRequest =

telephony/java/android/telephony/data/IDataService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -48,5 +48,5 @@ oneway interface IDataService 
    void cancelHandover(int slotId, int cid, IDataServiceCallback callback);

    void registerForUnthrottleApn(int slotIndex, IDataServiceCallback callback);

    void unregisterForUnthrottleApn(int slotIndex, IDataServiceCallback callback);

    void requestValidation(int slotId, int cid, IIntegerConsumer callback);

    void requestNetworkValidation(int slotId, int cid, IIntegerConsumer callback);

}