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

Commit b92aa5bd authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge changes from topic 'framework-net-aosp' 

* changes:
  DO NOT MERGE: [CS] Remove timeout event after first available
  DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
  DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
  DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
  DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
  DO NOT MERGE: Move FakeSettingsProvider to a common location.
  DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
  DO NOT MERGE: Add option to skip and avoid captive portals.
  DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime
  DO NOT MERGE: Do not synchronize boolean reads/writes
  DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters
  DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
  DO NOT MERGE: Support timeouts for requestNetwork() invocations.
  DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network.
parents 78f3f004 bf3b1bad

core/java/android/net/ConnectivityManager.java

+24 −3
Original line number Diff line number Diff line
@@ -2592,7 +2592,8 @@ public class ConnectivityManager { 


        /**

         * Called if no network is found in the given timeout time.  If no timeout is given,

         * this will not be called.

         * this will not be called. The associated {@link NetworkRequest} will have already

         * been removed and released, as if {@link #unregisterNetworkCallback} had been called.

         * @hide

         */

        public void onUnavailable() {}
@@ -2665,6 +2666,26 @@ public class ConnectivityManager { 
    /** @hide */

    public static final int CALLBACK_RESUMED             = BASE + 12;



    /** @hide */

    public static String getCallbackName(int whichCallback) {

        switch (whichCallback) {

            case CALLBACK_PRECHECK:     return "CALLBACK_PRECHECK";

            case CALLBACK_AVAILABLE:    return "CALLBACK_AVAILABLE";

            case CALLBACK_LOSING:       return "CALLBACK_LOSING";

            case CALLBACK_LOST:         return "CALLBACK_LOST";

            case CALLBACK_UNAVAIL:      return "CALLBACK_UNAVAIL";

            case CALLBACK_CAP_CHANGED:  return "CALLBACK_CAP_CHANGED";

            case CALLBACK_IP_CHANGED:   return "CALLBACK_IP_CHANGED";

            case CALLBACK_RELEASED:     return "CALLBACK_RELEASED";

            case CALLBACK_EXIT:         return "CALLBACK_EXIT";

            case EXPIRE_LEGACY_REQUEST: return "EXPIRE_LEGACY_REQUEST";

            case CALLBACK_SUSPENDED:    return "CALLBACK_SUSPENDED";

            case CALLBACK_RESUMED:      return "CALLBACK_RESUMED";

            default:

                return Integer.toString(whichCallback);

        }

    }



    private class CallbackHandler extends Handler {

        private final HashMap<NetworkRequest, NetworkCallback>mCallbackMap;

        private final AtomicInteger mRefCount;
@@ -2831,7 +2852,7 @@ public class ConnectivityManager { 
    private final static int REQUEST = 2;



    private NetworkRequest sendRequestForNetwork(NetworkCapabilities need,

            NetworkCallback networkCallback, int timeoutSec, int action,

            NetworkCallback networkCallback, int timeoutMs, int action,

            int legacyType) {

        if (networkCallback == null) {

            throw new IllegalArgumentException("null NetworkCallback");
@@ -2847,7 +2868,7 @@ public class ConnectivityManager { 
                            new Messenger(sCallbackHandler), new Binder());

                } else {

                    networkCallback.networkRequest = mService.requestNetwork(need,

                            new Messenger(sCallbackHandler), timeoutSec, new Binder(), legacyType);

                            new Messenger(sCallbackHandler), timeoutMs, new Binder(), legacyType);

                }

                if (networkCallback.networkRequest != null) {

                    sNetworkCallback.put(networkCallback.networkRequest, networkCallback);

core/java/android/provider/Settings.java

+34 −0
Original line number Diff line number Diff line
@@ -8027,12 +8027,46 @@ public final class Settings { 
         */

        public static final String PAC_CHANGE_DELAY = "pac_change_delay";



        /**

         * Don't attempt to detect captive portals.

         *

         * @hide

         */

        public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0;



        /**

         * When detecting a captive portal, display a notification that

         * prompts the user to sign in.

         *

         * @hide

         */

        public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1;



        /**

         * When detecting a captive portal, immediately disconnect from the

         * network and do not reconnect to that network in the future.

         *

         * @hide

         */

        public static final int CAPTIVE_PORTAL_MODE_AVOID = 2;



        /**

         * What to do when connecting a network that presents a captive portal.

         * Must be one of the CAPTIVE_PORTAL_MODE_* constants above.

         *

         * The default for this setting is CAPTIVE_PORTAL_MODE_PROMPT.

         * @hide

         */

        public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";



        /**

         * Setting to turn off captive portal detection. Feature is enabled by

         * default and the setting needs to be set to 0 to disable it.

         *

         * @deprecated use CAPTIVE_PORTAL_MODE_IGNORE to disable captive portal detection

         * @hide

         */

        @Deprecated

        public static final String

                CAPTIVE_PORTAL_DETECTION_ENABLED = "captive_portal_detection_enabled";

core/tests/utiltests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ LOCAL_SRC_FILES += src/android/util/IRemoteMemoryIntArray.aidl 


LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    frameworks-base-testutils \

    mockito-target



LOCAL_JAVA_LIBRARIES := android.test.runner

services/tests/servicestests/src/com/android/internal/util/FakeSettingsProviderTest.java→core/tests/utiltests/src/com/android/internal/util/test/FakeSettingsProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.util;

package com.android.internal.util.test;



import android.content.ContentResolver;

import android.database.ContentObserver;

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

+43 −6
Original line number Diff line number Diff line
@@ -1813,11 +1813,14 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    private void updateMtu(LinkProperties newLp, LinkProperties oldLp) {

        final String iface = newLp.getInterfaceName();

        final int mtu = newLp.getMtu();

        if (oldLp == null && mtu == 0) {

            // Silently ignore unset MTU value.

            return;

        }

        if (oldLp != null && newLp.isIdenticalMtu(oldLp)) {

            if (VDBG) log("identical MTU - not setting");

            return;

        }



        if (LinkProperties.isValidMtu(mtu, newLp.hasGlobalIPv6Address()) == false) {

            if (mtu != 0) loge("Unexpected mtu value: " + mtu + ", " + iface);

            return;
@@ -2263,11 +2266,19 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                    synchronized (mNetworkForNetId) {

                        nai = mNetworkForNetId.get(netId);

                    }

                    // If captive portal status has changed, update capabilities.

                    // If captive portal status has changed, update capabilities or disconnect.

                    if (nai != null && (visible != nai.lastCaptivePortalDetected)) {

                        final int oldScore = nai.getCurrentScore();

                        nai.lastCaptivePortalDetected = visible;

                        nai.everCaptivePortalDetected |= visible;

                        if (nai.lastCaptivePortalDetected &&

                            Settings.Global.CAPTIVE_PORTAL_MODE_AVOID == getCaptivePortalMode()) {

                            if (DBG) log("Avoiding captive portal network: " + nai.name());

                            nai.asyncChannel.sendMessage(

                                    NetworkAgent.CMD_PREVENT_AUTOMATIC_RECONNECT);

                            teardownUnneededNetwork(nai);

                            break;

                        }

                        updateCapabilities(oldScore, nai, nai.networkCapabilities);

                    }

                    if (!visible) {
@@ -2288,6 +2299,12 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            return true;

        }



        private int getCaptivePortalMode() {

            return Settings.Global.getInt(mContext.getContentResolver(),

                    Settings.Global.CAPTIVE_PORTAL_MODE,

                    Settings.Global.CAPTIVE_PORTAL_MODE_PROMPT);

        }



        private boolean maybeHandleNetworkAgentInfoMessage(Message msg) {

            switch (msg.what) {

                default:
@@ -2597,14 +2614,28 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                "request NetworkCapabilities", ConnectivityManager.CALLBACK_CAP_CHANGED);

    }



    private void handleTimedOutNetworkRequest(final NetworkRequestInfo nri) {

        if (mNetworkRequests.get(nri.request) != null && mNetworkForRequestId.get(

                nri.request.requestId) == null) {

            handleRemoveNetworkRequest(nri, ConnectivityManager.CALLBACK_UNAVAIL);

        }

    }



    private void handleReleaseNetworkRequest(NetworkRequest request, int callingUid) {

        final NetworkRequestInfo nri = getNriForAppRequest(

                request, callingUid, "release NetworkRequest");

        if (nri == null) return;

        if (nri != null) {

            handleRemoveNetworkRequest(nri, ConnectivityManager.CALLBACK_RELEASED);

        }

    }



        if (VDBG || (DBG && nri.request.isRequest())) log("releasing " + request);

    private void handleRemoveNetworkRequest(final NetworkRequestInfo nri, final int whichCallback) {

        final String logCallbackType = ConnectivityManager.getCallbackName(whichCallback);

        if (VDBG || (DBG && nri.request.isRequest())) {

            log("releasing " + nri.request + " (" + logCallbackType + ")");

        }

        nri.unlinkDeathRecipient();

        mNetworkRequests.remove(request);

        mNetworkRequests.remove(nri.request);

        synchronized (mUidToNetworkRequestCount) {

            int requests = mUidToNetworkRequestCount.get(nri.mUid, 0);

            if (requests < 1) {
@@ -2698,7 +2729,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                }

            }

        }

        callCallbackForRequest(nri, null, ConnectivityManager.CALLBACK_RELEASED, 0);

        callCallbackForRequest(nri, null, whichCallback, 0);

    }



    @Override
@@ -2935,6 +2966,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                    handleRegisterNetworkRequestWithIntent(msg);

                    break;

                }

                case EVENT_TIMEOUT_NETWORK_REQUEST: {

                    NetworkRequestInfo nri = (NetworkRequestInfo) msg.obj;

                    handleTimedOutNetworkRequest(nri);

                    break;

                }

                case EVENT_RELEASE_NETWORK_REQUEST_WITH_INTENT: {

                    handleReleaseNetworkRequestWithIntent((PendingIntent) msg.obj, msg.arg1);

                    break;
@@ -5315,6 +5351,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    // notify only this one new request of the current state

    protected void notifyNetworkCallback(NetworkAgentInfo nai, NetworkRequestInfo nri) {

        int notifyType = ConnectivityManager.CALLBACK_AVAILABLE;

        mHandler.removeMessages(EVENT_TIMEOUT_NETWORK_REQUEST, nri);

        if (nri.mPendingIntent == null) {

            callCallbackForRequest(nri, nai, notifyType, 0);

        } else {