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

Commit db651f63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ie8d98359,I4d5cadfd am: 69508ee6 am: a2ca3e18 am: 639ccdbd am: 5d512003 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I558ea1c98541423fdacfc2f31488aee1098fe49c
parents 3f569e2f 5d512003

services/core/java/com/android/server/ConnectivityService.java

+17 −11
Original line number Diff line number Diff line
@@ -4462,16 +4462,13 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                case EVENT_SET_REQUIRE_VPN_FOR_UIDS:

                    handleSetRequireVpnForUids(toBool(msg.arg1), (UidRange[]) msg.obj);

                    break;

                case EVENT_SET_OEM_NETWORK_PREFERENCE:

                case EVENT_SET_OEM_NETWORK_PREFERENCE: {

                    final Pair<OemNetworkPreferences, IOnSetOemNetworkPreferenceListener> arg =

                            (Pair<OemNetworkPreferences,

                                    IOnSetOemNetworkPreferenceListener>) msg.obj;

                    try {

                    handleSetOemNetworkPreference(arg.first, arg.second);

                    } catch (RemoteException e) {

                        loge("handleMessage.EVENT_SET_OEM_NETWORK_PREFERENCE failed", e);

                    }

                    break;

                }

                case EVENT_REPORT_NETWORK_ACTIVITY:

                    mNetworkActivityTracker.handleReportNetworkActivity();

                    break;
@@ -5280,6 +5277,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        public String toString() {

            return "uid/pid:" + mUid + "/" + mPid + " active request Id: "

                    + (mActiveRequest == null ? null : mActiveRequest.requestId)

                    + " callback request Id: "

                    + mNetworkRequestForCallback.requestId

                    + " " + mRequests

                    + (mPendingIntent == null ? "" : " to trigger " + mPendingIntent);

        }
@@ -7136,7 +7135,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                        toUidRangeStableParcels(nri.getUids()));

            }

        } catch (RemoteException | ServiceSpecificException e) {

            loge("Exception setting OEM network preference default network :" + e);

            loge("Exception setting OEM network preference default network", e);

        }

    }
@@ -7208,7 +7207,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            }



            public String toString() {

                return mNetworkRequestInfo.mRequests.get(0).requestId + " : "

                final NetworkRequest requestToShow = null != mNewNetworkRequest

                        ? mNewNetworkRequest : mNetworkRequestInfo.mRequests.get(0);

                return requestToShow.requestId + " : "

                        + (null != mOldNetwork ? mOldNetwork.network.getNetId() : "null")

                        + " → " + (null != mNewNetwork ? mNewNetwork.network.getNetId() : "null");

            }
@@ -7292,6 +7293,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                newSatisfier.unlingerRequest(NetworkRequest.REQUEST_ID_NONE);

            }



            // if newSatisfier is not null, then newRequest may not be null.

            newSatisfier.unlingerRequest(newRequest.requestId);

            if (!newSatisfier.addRequest(newRequest)) {

                Log.wtf(TAG, "BUG: " + newSatisfier.toShortString() + " already has "
@@ -9011,7 +9013,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    private void handleSetOemNetworkPreference(

            @NonNull final OemNetworkPreferences preference,

            @NonNull final IOnSetOemNetworkPreferenceListener listener) throws RemoteException {

            @Nullable final IOnSetOemNetworkPreferenceListener listener) {

        Objects.requireNonNull(preference, "OemNetworkPreferences must be non-null");

        if (DBG) {

            log("set OEM network preferences :" + preference.toString());
@@ -9023,7 +9025,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        // TODO http://b/176496396 persist data to shared preferences.



        if (null != listener) {

            try {

                listener.onComplete();

            } catch (RemoteException e) {

                loge("handleMessage.EVENT_SET_OEM_NETWORK_PREFERENCE failed", e);

            }

        }

    }
@@ -9039,10 +9045,10 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        mDefaultNetworkRequests.addAll(nris);

        final ArraySet<NetworkRequestInfo> perAppCallbackRequestsToUpdate =

                getPerAppCallbackRequestsToUpdate();

        handleRemoveNetworkRequests(perAppCallbackRequestsToUpdate);

        final ArraySet<NetworkRequestInfo> nrisToRegister = new ArraySet<>(nris);

        nrisToRegister.addAll(

                createPerAppCallbackRequestsToRegister(perAppCallbackRequestsToUpdate));

        handleRemoveNetworkRequests(perAppCallbackRequestsToUpdate);

        handleRegisterNetworkRequests(nrisToRegister);

    }

tests/net/java/com/android/server/ConnectivityServiceTest.java

+3 −4
Original line number Diff line number Diff line
@@ -9932,12 +9932,11 @@ public class ConnectivityServiceTest { 
                .build();















        // Act on ConnectivityService.setOemNetworkPreference()













        final TestOemListenerCallback mOnSetOemNetworkPreferenceTestListener =













                new TestOemListenerCallback();













        mService.setOemNetworkPreference(pref, mOnSetOemNetworkPreferenceTestListener);













        final TestOemListenerCallback oemPrefListener = new TestOemListenerCallback();













        mService.setOemNetworkPreference(pref, oemPrefListener);





























        // Verify call returned successfully













        mOnSetOemNetworkPreferenceTestListener.expectOnComplete();













        oemPrefListener.expectOnComplete();















    }





























    private static class TestOemListenerCallback implements IOnSetOemNetworkPreferenceListener {