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

Commit 31847189 authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Send error if ONS is not available 

Send error for data switch api if ONS is not available

Bug: 136294842
Test: regression test
Change-Id: If844939c0936729e4487b6e4f75cd58d28195718
parent be0c1784

telephony/java/android/telephony/TelephonyManager.java

+16 −4
Original line number Diff line number Diff line
@@ -10788,7 +10788,6 @@ public class TelephonyManager { 
     * @param callback Callback will be triggered once it succeeds or failed.

     *                 See {@link TelephonyManager.SetOpportunisticSubscriptionResult}

     *                 for more details. Pass null if don't care about the result.

     *

     */

    public void setPreferredOpportunisticDataSubscription(int subId, boolean needValidation,

            @Nullable @CallbackExecutor Executor executor, @Nullable Consumer<Integer> callback) {
@@ -10796,6 +10795,12 @@ public class TelephonyManager { 
        try {

            IOns iOpportunisticNetworkService = getIOns();

            if (iOpportunisticNetworkService == null) {

                if (executor == null || callback == null) {

                    return;

                }

                Binder.withCleanCallingIdentity(() -> executor.execute(() -> {

                    callback.accept(SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION);

                }));

                return;

            }

            ISetOpportunisticDataCallback callbackStub = new ISetOpportunisticDataCallback.Stub() {
@@ -10877,9 +10882,16 @@ public class TelephonyManager { 
                if (executor == null || callback == null) {

                    return;

                }

                if (iOpportunisticNetworkService == null) {

                    /* Todo<b/130595455> passing unknown due to lack of good error codes */

                    Binder.withCleanCallingIdentity(() -> executor.execute(() -> {

                        callback.accept(UPDATE_AVAILABLE_NETWORKS_UNKNOWN_FAILURE);

                    }));

                } else {

                    Binder.withCleanCallingIdentity(() -> executor.execute(() -> {

                        callback.accept(UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS);

                    }));

                }

                return;

            }

            IUpdateAvailableNetworksCallback callbackStub =