Skip to content
Snippets Groups Projects
  1. Oct 16, 2023
  2. Oct 14, 2023
  3. Oct 13, 2023
    • Patrick Rohr's avatar
    • Anton Hansson's avatar
      Fix broken documentation in Connectivity · 5ac6c0b0
      Anton Hansson authored
      EthernetManager is @SystemApi, so cannot be referenced from public
      API.
      
      Bug: 303184203
      Test: m docs
      Change-Id: Ib5cc07c89b4ecfdeae704da131ebb307816e35fa
      5ac6c0b0
    • Anton Kulakov's avatar
      Revert "Tell netd about local networks" · cc409153
      Anton Kulakov authored
      Revert submission 2777667
      
      Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/305187495
      
      Reverted changes: /q/submissionid:2777667
      
      Bug: 305187495
      
      Change-Id: Icb46558d17b56f9f6fd402f1489de9ed2b8f7644
      cc409153
    • Anton Kulakov's avatar
      Revert "Add LocalNetworkConfig" · 6eea22b1
      Anton Kulakov authored
      Revert submission 2777667
      
      Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/305187495
      
      Reverted changes: /q/submissionid:2777667
      
      Bug: 305187495
      
      Change-Id: Iae4ef936a4c111ae5668e539ce4cdbbb14c811f4
      6eea22b1
    • Anton Kulakov's avatar
      Revert "Simplify addRoutesToLocalNetwork calls" · 316346be
      Anton Kulakov authored
      Revert submission 2777667
      
      Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/305187495
      
      Reverted changes: /q/submissionid:2777667
      
      Bug: 305187495
      
      Change-Id: I516d40b20d775e9c61b2f825bc094329d016d0c3
      316346be
    • Treehugger Robot's avatar
    • Jean Chalard's avatar
      Merge changes I3b6ee1db,I70e13303,I6fb7dfe4 into main · a6190bd6
      Jean Chalard authored
      * changes:
        Simplify addRoutesToLocalNetwork calls
        Add LocalNetworkConfig
        Tell netd about local networks
      a6190bd6
    • Paul Hu's avatar
      Add ServiceExpiredCallback · d4dcb4be
      Paul Hu authored
      This is a no-op change and refactors the design for subsequent
      TTL expiration check changes.
      - Add a ServiceExpiredCallback to notify expired services.
      - To simplify the design, pass the CacheKey to MdnsServiceCache
        methods instead.
      
      Bug: 265787401
      Test: atest FrameworksNetTests CtsNetTestCases
      Change-Id: I930a4f7baf9b8d3d0037dc6aefd717dbdd486520
      d4dcb4be
    • Chalard Jean's avatar
      Simplify addRoutesToLocalNetwork calls · cf70df3e
      Chalard Jean authored
      There are only three calls to this method, and two of them
      are with a list of 1 address which means it's simpler inlined.
      
      The last call will be replaced with calls to RouteController
      in a followup, meaning we addRoutesToLocalNetwork can be removed.
      
      Test: RouterAdvertisementDaemonTest
            NetdUtilsTest
      Change-Id: I3b6ee1db40f09954b336321000735a66306bf000
      cf70df3e
    • Chalard Jean's avatar
      Add LocalNetworkConfig · fa21cafc
      Chalard Jean authored
      This doesn't do anything at this patchset, but the whole
      pipe from the agent to ConnectivityService is built.
      
      LocalNetworkInfo will be the name of the public information
      sent in callbacks to clients.
      
      Test: CSLocalAgentTests
      Change-Id: I70e133031ef3b0aaf6c3e59ccc2ad895c66d339c
      fa21cafc
    • Chalard Jean's avatar
      Tell netd about local networks · 774dc3cd
      Chalard Jean authored
      This patch does the following :
      • When a network is local but the system doesn't support it,
        throw in registerNetworkAgent.
      • When a network is local, tell netd about it.
      • Add tests for the above, as well as a test for callbacks
        being sent correctly when the caps are set and not when
        they aren't and that the new keep connected flag is
        respected.
      
      Telling netd about the network being local has it add two
      routes that do not exist if the network is not local :
      • One at PRIORITY_LOCAL_NETWORK matching unmarked sockets
        and looking up the table for the interface.
      20000: from all fwmark 0x0/0x10000 lookup xxxx
      • One at PRIORITY_EXPLICIT_NETWORK matching explicitly on
        network 99, so that dnsmasq traffic and any OEM traffic
        marked for network 99 flowing there.
      16000: from all fwmark 0x10063/0x1ffff iif lo lookup xxxx
      IMPLICIT_NETWORK and EXPLICIT_NETWORK rules are installed
      by connectivity service as a matter of course whether the
      network is local or not.
      
      See commit If8729fc6f3716a580c936584b851bc38000b5de5 for
      implementation details of this mechanic.
      
      There is no need to implement anything in particular for the
      new connected reason, as the current implementation will
      already keep it connected. A new test makes sure of that.
      
      Test: FrameworksNetTests
            CtsNetTestCases
            FrameworksNetIntegrationTests
            NetworkStackTests
            NetworkStaticLibTests
            TetheringTests
            MtsTetheringTestLatestSdk
            TetheringIntegrationTests
      Change-Id: I6fb7dfe4c232eea8cac9ac268897ddb36bb794d1
      774dc3cd
    • Hansen Kurli's avatar
      Merge changes I22d67a7e,Ida4a4bc7,Ie8522862,Id55d8d6c into main · ccfc5214
      Hansen Kurli authored
      * changes:
        Ensure nri is satisfied before returning.
        Add testLockdownVpn that mocks platform VPN.
        Make variables in testLegacyLockdownVpn() final.
        Update testLegacyLockdownVpn to mock VPN.
      ccfc5214
  4. Oct 12, 2023
    • Paul Duffin's avatar
      Add additional overriding methods to signature files · b3c3f2e9
      Paul Duffin authored
      This change adds overriding methods that are essential to compile the
      stubs generated from the signature files.
      
      More information and the background for this change is available at
      go/add-overriding-one-pager.
      
      Test: m checkapi
      Bug: 299366704
      Change-Id: Idba307148fd9afa87bfb7e0c89e00d9bd97ec204
      b3c3f2e9
    • Patrick Rohr's avatar
    • Patrick Rohr's avatar
      Include both eth%d and usb%d ethernet interfaces on U+ · 11eac8e1
      Patrick Rohr authored
      Ethernet interface naming is not consistent on Linux. While some USB
      ethernet dongles show up as eth0, others might show up as usb0.
      
      This CL changes config_ethernet_iface_regex to "*" which stands for "use
      Android version specific default". The default will include both usb\d+
      and eth%d named interfaces on Android U+. Android T will continue to
      only include eth%d interfaces (note that the "+" is a new addition which
      is highly unlikely to have any actual effect, but is more technically
      correct).
      
      Bug: 304335605
      Test: TH
      Change-Id: I823be8ee390cb2b6dd41b537c72ed76f5aa9e0ea
      11eac8e1
    • Jean Chalard's avatar
      Merge changes Ic490fee6,If78047c3 into main · 10353d53
      Jean Chalard authored
      * changes:
        Add hidden constants for communicating about local network agents
        Use isAtLeast* from deps
      10353d53
    • Hansen Kurli's avatar
      Ensure nri is satisfied before returning. · ed972a6f
      Hansen Kurli authored
      When a network preference is set, the highest priority nri will
      be a managed default request that disallows default networking.
      In the case where there is no satisfying network,
      mNoServiceNetwork is used as the satisfier instead of null.
      (see computeNetworkReassignment)
      
      mNoServiceNetwork should not be returned in any public API.
      Check for the nri being satisfied before returning the satisfier
      to ensure mNoServiceNetwork is not returned.
      
      Fixes: 301222648
      Test: atest FrameworksNetTests
      Change-Id: I22d67a7e8d0274d8ad4f6123fbedf6d37eed18e7
      ed972a6f
    • Hansen Kurli's avatar
      Add testLockdownVpn that mocks platform VPN. · 48c14686
      Hansen Kurli authored
      Add a test for lockdown vpn that uses TYPE_IKEV2_IPSEC_PSK and
      mocks platform VPN by override in startLegacyVpnPrivileged().
      In the context of ConnectivityService, setVpnDefaultForUids()
      is the main interaction.
      
      Refactor testLegacyLockdownVpn to take a VpnProfile and assert
      behaviors with and without setVpnDefaultForUids().
      This includes:
          1. Updating callback asserts and assertActiveNetworkInfo to
             reflect setVpnDefaultForUids().
          2. Adding TODOs where mCm.getActiveNetworkInfo() returns
             unexpected values.
      
      Bug: 230548427
      Test: atest FrameworksNetTests
      Change-Id: Ida4a4bc745af5ba2fc251795b2ffca56ead79b7f
      48c14686
    • Motomu Utsumi's avatar
    • Paul Hu's avatar
    • Chalard Jean's avatar
      Add hidden constants for communicating about local network agents · d6f4efb1
      Chalard Jean authored
      Test: FrameworksNetTests
      Change-Id: Ic490fee6ee70d74acff0a290199b2946817173d0
      d6f4efb1
    • Chalard Jean's avatar
      Use isAtLeast* from deps · 5efbcf7b
      Chalard Jean authored
      CSTest and CSAgentWrapper need to agree on what the current
      version is
      
      Test: CSTest*
      Change-Id: If78047c36ce213a531207d25b410e870691fbb98
      5efbcf7b
    • Paul Hu's avatar
      Stop the created handler threads on the tests · ebbbf8f4
      Paul Hu authored
      The created handler thread will stay there for a while until
      all the tests are finished. This is considered as a leakage
      which will take the resource from the devices. In low end
      devices, this may possibly impact the performance. The created
      threads should be closed explicitly.
      
      Test: atest ConnectivityCoverageTests ConntrackSocketTest
      Change-Id: Ic1beb2a210e7c8c80c66fc9e0727c47599150672
      ebbbf8f4
    • Jean Chalard's avatar
      Merge changes Ibb8d33b7,Ie168fe1f,I9f699b63 into main · 02193c0c
      Jean Chalard authored
      * changes:
        Prepare exposing Network{Request,Caps}.forbiddenCapabilities
        Add a keep connected for test reason
        Improvements to CSTest : legacy type, wait for LOST, permissions
      02193c0c
  5. Oct 11, 2023
    • Jihoon Kang's avatar
    • Hansen Kurli's avatar
      Merge changes Ib24809ec,Id9d26435 into main · 270813c4
      Hansen Kurli authored
      * changes:
        Remove the fail case on IPv6 in testLockdownVpn
        Remove LockdownVpnTracker from testLegacyLockdownVpn
      270813c4
    • Chalard Jean's avatar
      Prepare exposing Network{Request,Caps}.forbiddenCapabilities · cf7dbcae
      Chalard Jean authored
      This is useful going forward in particular because there will
      be a default forbidden capability for LOCAL_NETWORKS. This
      means it will be useful to be able to remove it.
      
      It is also generally useful and we have been wanting to open
      this API to the public, so this is a good opportunity to do so.
      
      Test: new tests for NetworkRequest
            NetworkCapabilitiesTest already has tests because it
            already was @SystemApi
      Change-Id: Ibb8d33b799f2d274326fd9cd0b05a2c33a18032a
      cf7dbcae
    • Chalard Jean's avatar
      Add a keep connected for test reason · c517fb12
      Chalard Jean authored
      This has been sorely needed for a while. Instead of filing requests
      for each of your networks in a CSTest, which is fiddly at best and
      sometimes almost impossible (because you can't single out the network),
      you can now add this flag and be done with it.
      
      Test: CSKeepConnectedTest
      Change-Id: Ie168fe1f3a17de035fdf05e3d6580d3262a3448e
      c517fb12
    • Chalard Jean's avatar
      Improvements to CSTest : legacy type, wait for LOST, permissions · 026ca940
      Chalard Jean authored
      • Make sure all Agents have a legacy type. This is necessary to
        avoid crashes in LegacyNetworkTracker
      • Wait for LOST when disconnecting a network
      • Make sure the test package sees its own permissions (importantly
        it can't see background networks otherwise, because it lacks
        CHANGE_NETWORKING_STATE)
      
      Test: in the followup
      Change-Id: I9f699b6372a8fe0d5bcd5310d8f35f72e48a6c61
      026ca940
  6. Oct 10, 2023
Loading