Commit graph android_packages_modules_Co.../Tethering/Android.bp
Message SHA1
Rename framework-connectivity-tiramisu to framework-connectivity-t
Bug: 215434166
Ignore-AOSP-First: Merge conflict. Will cherry-pick to AOSP afterwards.
Test: build, flash, device boot to home.
Merged-In: I9ebedf8813cbfa30d979bc35a3b2306715be682b
Change-Id: I9ebedf8813cbfa30d979bc35a3b2306715be682b

paulhu   authored and   Paul Hu   commited 2022-02-20 15:12:13 +00:00
699477a8f0
Merge "Move permissions allowlist for Tethering" am: a828eb711c am: 3febed8d4d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1909681

Change-Id: I4be40cf86e5aa52f8babe0bb0ec0a6b6dbe688a1

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-15 05:20:51 +00:00
095e88f024
Merge "Move permissions allowlist for Tethering"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-02-15 04:43:27 +00:00
a828eb711c
Move permissions allowlist for Tethering
The allowlist will now be in the apex instead.

Test: boots && check permissions.xml is bundled
Bug: 190375768

Change-Id: Ia7434cba54d2b51479e52323f22c7f454499991d

Andrei Onea   commited 2022-02-10 15:04:46 +00:00
52eac028fc
[MS54.3] Move NetworkStats to updatable sources
This CL builds NetworkStats related codes with the
connectivity module instead of platform.

Ignore-AOSP-First: Avoiding conflicts; cherry-pick will follow
Test: TH
Bug: 197717846
Change-Id: I4eeb7ea9cfc3139991caf0fc22474e0052a0391c

Junyu Lai   authored and   Remi NGUYEN VAN   commited 2022-02-07 10:11:40 +09:00
2ef865e0fd
Merge changes I50417e69,I6892d81c,Id8846844,Ib22da8d4,Iad66f0d4 am: 445dede4eb am: c39923d0bb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1970383

Change-Id: I055f0f76bf1428040d0ff43efa1336b140af4eb1

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-02-03 19:57:03 +00:00
25a6d06afa
Merge changes I50417e69,I6892d81c,Id8846844,Ib22da8d4,Iad66f0d4 am: 445dede4eb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1970383

Change-Id: Idc9dc0f9edfaaa419ba00baca579f422bc2d2298

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-02-03 19:34:59 +00:00
c39923d0bb
remove spurious headers
bpf_connectivity_headers already pulls in bpf_headers,
which already pulls in bpf_syscall_wrappers.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib22da8d433bd3187349f06f41ec064360c38982f

Maciej Żenczykowski   commited 2022-02-02 16:38:36 -08:00
2f7dac1bad
Merge "Remove libtcutils from dependencies as it is included in lib bpfjni" am: 35e2ab4c11 am: 3bd97bc32e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962503

Change-Id: I8760e36daed6fa63077f87472a8099695b79eaf5

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-02 23:08:09 +00:00
383854c0d6
Merge "Remove libtcutils from dependencies as it is included in lib bpfjni" am: 35e2ab4c11
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962503

Change-Id: Ia9c96dce86626b2548ddd233362a639982890f80

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-02 22:53:41 +00:00
3bd97bc32e
Remove libtcutils from dependencies as it is included in lib bpfjni
Test: builds && boots
Change-Id: Iacaed446655a606399188b8e5e4a5e98fefee121

Patrick Rohr   authored and   Maciej Żenczykowski   commited 2022-02-02 19:40:12 +00:00
8dfcb14be3
Merge "Conditionally disable TetheringApiCurrentLib" am: 2be7b1d5fb am: fe097c8ab1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958897

Change-Id: I245100e8930bfd4879e7e61a2e31af8ecc1e4beb

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-28 05:48:04 +00:00
9a9c37de96
Merge "Conditionally disable TetheringApiCurrentLib" am: 2be7b1d5fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958897

Change-Id: I2eaa731f5048db62a8966320a979f8c2c8747cc4

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-28 05:36:59 +00:00
fe097c8ab1
Merge "Conditionally disable TetheringApiCurrentLib"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-01-28 05:21:22 +00:00
2be7b1d5fb
Conditionally disable TetheringApiCurrentLib
The "current" targets are only necessary in branches that can use
non-stable APIs, and can fail to build otherwise.

Apply ConnectivityNextEnableDefaults so they are disabled on such
branches. Also deprecate NetworkStackNextEnableDefaults, so
ConnectivityNextEnableDefaults is used everywhere.

Bug: 190249673
Test: m
Change-Id: I1b152f3cc22f1bed6444d280f0066e480980e949

Remi NGUYEN VAN   commited 2022-01-27 18:49:19 +09:00
f826bce37a
Adding bt dependency
Ignore-AOSP-First: BT module migration split between goog and aosp.
Bug: 206121418
Test: Compile
Merged-In: I92f3971ba1bb7e873166482f7051dcd2b9df5bf2
Change-Id: I92f3971ba1bb7e873166482f7051dcd2b9df5bf2

Roopa Sattiraju   authored and   Rahul Sabnis   commited 2022-01-27 02:16:21 +00:00
068cf1cbee
Adding bt dependency
Bug: 206121418
Test: Compile
Merged-In: I92f3971ba1bb7e873166482f7051dcd2b9df5bf2
Change-Id: I92f3971ba1bb7e873166482f7051dcd2b9df5bf2

Roopa Sattiraju   authored and   Rahul Sabnis   commited 2022-01-25 20:27:30 -08:00
27acf0b677
Adding bt dependency
Ignore-AOSP-First: BT module migration split between goog and aosp.
Bug: 206121418
Test: Compile
Change-Id: I92f3971ba1bb7e873166482f7051dcd2b9df5bf2

Roopa Sattiraju   commited 2022-01-25 14:47:41 -08:00
f0269e7bb0
Merge "Move BpfUtils -- integrate TcUtils into Tethering module" am: 612afc316a am: 402af7954f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1948308

Change-Id: I5e79276d092f4f1637e915104d5559e925c73bcc

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-14 03:37:16 +00:00
4fc0d99f98
Merge "Move BpfUtils -- integrate TcUtils into Tethering module" am: 612afc316a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1948308

Change-Id: Iee4720fd215ff2aab86bf7bc1b19d6b522da8885

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-14 03:13:32 +00:00
402af7954f
Merge "Move BpfUtils -- integrate TcUtils into Tethering module"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-01-14 02:53:15 +00:00
612afc316a
Move BpfUtils -- integrate TcUtils into Tethering module
Bug: 202086915
Bug: 157552970
Test: atest TetheringTests
Change-Id: Ibf9d8d568b9f890a22869e70384848e33a380d4f

Patrick Rohr   commited 2022-01-13 10:09:11 +01:00
a881ba3001
Merge "Bump tethering target sdk version to 31" am: 0d4f956b34 am: 2c212ee85b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1879617

Change-Id: I0ac213f6d581f6072ba6b2060ea0e68b10eb949b

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-13 05:26:16 +00:00
976c27c58d
Merge "Bump tethering target sdk version to 31" am: 0d4f956b34
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1879617

Change-Id: Ia66df299012a8c58cdc073f571764910be911f0e

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-13 05:15:16 +00:00
2c212ee85b
Merge "Bump tethering target sdk version to 31"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-01-13 05:00:02 +00:00
0d4f956b34
Bump tethering target sdk version to 31
Also add BLUETOOTH_CONNECT permission which is needed for access
PanService if target sdk 31+. The permission would be granted to
privilege application without prompt.

Also remove the min_sdk_version 29 from AndroidManifest because it is
useless that the Android.bp already define min_sdk_version 30.

$aapt dump xmltree TetheringNext.apk AndroidManifest.xml
N: android=http://schemas.android.com/apk/res/android
  E: manifest (line=19)
    A: android:sharedUserId(0x0101000b)="android.uid.networkstack" (Raw: "android.uid.networkstack")
    A: android:versionCode(0x0101021b)=(type 0x10)0x1f
    A: android:versionName(0x0101021c)="Tiramisu" (Raw: "Tiramisu")
    A: android:compileSdkVersion(0x01010572)=(type 0x10)0x1f
    A: android:compileSdkVersionCodename(0x01010573)="Tiramisu" (Raw: "Tiramisu")
    A: package="com.android.networkstack.tethering" (Raw: "com.android.networkstack.tethering")
    A: platformBuildVersionCode=(type 0x10)0x1f
    A: platformBuildVersionName="Tiramisu" (Raw: "Tiramisu")
    E: uses-sdk (line=23)
      A: android:minSdkVersion(0x0101020c)=(type 0x10)0x1e
      A: android:targetSdkVersion(0x01010270)=(type 0x10)0x1f
    ....
    E: uses-permission (line=35)
      A: android:name(0x01010003)="android.permission.BLUETOOTH_CONNECT" (Raw: "android.permission.BLUETOOTH_CONNECT")

Bug: 204265450
Test: manual testing bluetooth tethering and TH
Change-Id: I6f821020679b9379cada29f6f0816187545a24fb

markchien   authored and   Mark Chien   commited 2022-01-12 07:24:16 +00:00
bf62258f8c
Dexopt service-connectivity.
`service-connectivity` is a jar that system_server loads dynamically.
Such jars can be dexopted now. This CL adds `service-connectivity` to a
`systemserverclasspath_fragment`, which does not actually add the jar to
the classpath, but tells the build system to dexopt it.

NOTE: The corresponding `exported_systemserverclasspath_fragments` needs
to be added to the `prebuilt_apex` once a new prebuilt is dropped.

Bug: 203198541
Test: m com.android.tethering
Change-Id: I53745baaf1bc7142cc12a1e6cd8d84c9b338ac9d
Merged-In: I53745baaf1bc7142cc12a1e6cd8d84c9b338ac9d
Merged-In: I9a009493fe0482967ab1f92516514715cfd457d6

Jiakai Zhang   commited 2021-12-21 09:36:33 +00:00
86c139aedb
Dexopt service-connectivity.
`service-connectivity` is a jar that system_server loads dynamically.
Such jars can be dexopted now. This CL adds `service-connectivity` to a
`systemserverclasspath_fragment`, which does not actually add the jar to
the classpath, but tells the build system to dexopt it.

NOTE: The corresponding `exported_systemserverclasspath_fragments` needs
to be added to the `prebuilt_apex` once a new prebuilt is dropped.

Bug: 203198541
Test: m com.android.tethering
Ignore-AOSP-First: Needs to skip sc-mainline-prod. Will be cherrypicked
  to AOSP later.
Change-Id: I53745baaf1bc7142cc12a1e6cd8d84c9b338ac9d

Jiakai Zhang   commited 2021-12-20 17:45:58 +00:00
9ecc66ddba
Merge "Enable strict_updatability_linting in connectivity src"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-12-08 02:36:16 +00:00
81bc609550
Merge "[NETD-BPF#3] Relocate Tethering/bpf_progs and rename bpf_tethering_headers"
Ken Chen   authored and   Gerrit Code Review   commited 2021-12-02 12:54:01 +00:00
5fabfd8dd0
Enable strict_updatability_linting in connectivity src
Bug: 188851968
Test: m lint-check
Change-Id: I3cd06ea16f05cb37d9369a48dd0285d8239fd764

Chiachang Wang   commited 2021-11-26 10:31:58 +08:00
3bc5276568
Add defaults to enable/disable connectivity/tethering next
The defaults can be used to enable/disable connectivity next targets
depending on the branch, while minimizing merge conflicts.

The "next" target may use unstable APIs. It need to be disabled in the
branch which only have the last stable SDK available.

Also correct TetheringTestsLatestSdkLib which should use stable API.

Test: TH
Change-Id: I00d91bbd513277c1cedf67d18ac9f56cc4037309

markchien   commited 2021-11-24 12:20:23 +08:00
598a75ba8c
[NETD-BPF#3] Relocate Tethering/bpf_progs and rename bpf_tethering_headers
The folder is currently used by tether offload only. Because we will
move netd.c and clatd.c to it, the folder should be moved to the upper
tier.

Also, rename bpf_tethering_headers to bpf_connectivity_headers so that
other connectivity code besides to tethering are justified to use it.

Bug: 202086915
Test: atest FrameworksNetTests
Change-Id: I95943c6e909f1fdca12604ef0c55d67c39ca686b

Ken Chen   commited 2021-11-20 18:31:08 +08:00
bb57fa9eec
Rename libbpfmapjni and include bpf common util library
1. libbpfmapjni.so is rename to libnet_utils_device_common_bpf.so
2. net-utils-device-common-bpf.jar is separated from
   net-utils-device-common-netlink.jar

Bug: 205088391
Test: atest TetheringTests
      atest CtsTetheringTest
      atest TetheringPrivilegedTests

Change-Id: If59b35b3429ebd597c18678499ff458183f89026

markchien   commited 2021-11-11 13:49:15 +08:00
782a56809b
Rename tethering jni and get the jni by its package name
tetherutiljni is renamed to com_android_networkstack_tethering_jni_util

Bug: 205088391
Test: atest TetheringTests
      atest CtsTetheringTest
      atest TetheringPrivilegedTests
Change-Id: Ifd1f4473625e33d3ebe190c9f8a2b5d54aa1ff49

markchien   commited 2021-11-10 14:07:24 +08:00
f967b11087
Separate tethering build target to Tethering and TetheringNext
To avoid much code diverge between aosp and its downstream, we need to
separate the build target which build with latest stable sdk in release
branch and build with unfreeze sdk in dev branch. So we could use new
API with APIshim in dev branch without impacting release branch.

BYPASS_INCLUSIVE_LANGUAGE_REASON=the wording is the file name of
existing file.
Bug: 204265450
Test: m
Change-Id: I949fd83b1eed7461e0b381193b190cf15080bc1b

markchien   authored and   Mark Chien   commited 2021-11-04 08:53:12 +00:00
5a8c806e55
Merge "bpfmap: Move to Common Location"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2021-11-04 01:50:15 +00:00
bb4c6073ec
bpfmap: Move to Common Location
Move bpfmap to frameworks/libs/net/common/native.

Bug: 179733303
Change-Id: Id08b216ec6a64968d66d7990f91ea7ce222a1154

Tyler Wear   commited 2021-10-29 09:05:33 -07:00
e8043ca762
Dependency update for StateMachine
StateMachine was in a custom filegroup in base.
It's now built in stand-alone library in modules-utils.

Bug: 198418216
Tag: #refactor
Test: Build
Merged-In: I7499fad6c4c5076e2bd98f0d9f91c5f243fb1ed2
Change-Id: I7499fad6c4c5076e2bd98f0d9f91c5f243fb1ed2

William Escande   authored and   wescande   commited 2021-10-01 17:06:42 +02:00
ea9e22e10b
Import net-utils-device-common-netlink instead of netlink-client.
After moving all netlink-client stuff to frameworks/libs/net/common
and build it as an individual library, deprecate the netlink-client
lib and use net-utils-device-common-netlink instead.

Due to that the package name of netlink lib has changed, also update the
package name used in Tethering and ConnectivityService module.

Bug: 192535368
Test: atest TetheringTests TetheringIntegrationTests
Change-Id: Ic2078caf67a640836d98c5a2e4ca89939adcb896

Xiao Ma   commited 2021-07-21 09:10:22 +00:00
09c0727e9e
Merge "[SP32] Try to get 1.1 OffloadControl hardware if available"
Junyu Lai   authored and   Gerrit Code Review   commited 2021-06-22 20:31:18 +00:00
69bc4fede1
Add tethering bootclasspath fragment to its sdk
This subsumes the java_sdk_library in the sdk.

Bug: 188427719
Test: build_mainline_modules.sh
Change-Id: Ib2ebb3893135b4dd91812f1f1b0915540cfd64cb
Merged-In: Ib2ebb3893135b4dd91812f1f1b0915540cfd64cb
(cherry picked from commit 3669599dec)

Anton Hansson   commited 2021-06-14 19:23:49 +01:00
a12ffacf6c
Add required permission to Tethering
The permission of Tethering is moved to a separate xml file,
add the xml module to the required field of tethering app.

Bug: 151213404
Test: TetheringTests
Merged-In: I40b45a0f1b44fba0b68e94811d14725a59ed4e59
Change-Id: I40b45a0f1b44fba0b68e94811d14725a59ed4e59

Aaron Huang   commited 2021-05-26 23:29:55 +08:00
3f69f1c418
No-op Refactoring of startTrackDefaultNetwork
While the actual part that track default request is inside
UpstreamNetworkMonitor, instead of passing it from Tethering,
move it into counter-part CL and use it from
UpstreamNetworkMonitor.

Since the current code is replaced by registerSystemDefaultCallback
in Android S, implement it inside the api30 shim implementation
to provide an unified interface to tethering.

Test: atest TetheringCoverageTests
Bug: 185952829
Change-Id: Iaf21b6b662aa6aba79c2b75379128b8523f81f02

junyulai   commited 2021-05-13 14:07:40 +08:00
b95083ea6a
[SP32] Try to get 1.1 OffloadControl hardware if available
This is a no-op change that try to use 1.1 HAL if available.
Otherwise, fallback to 1.0 HAL. The change also provides version
information for subsequent patches to determine what to do for
specific version.

Test: atest TetheringTests
Bug: 149467454
Merged-In: I6a3ce877cdff2496087b97b191a9bfd5b0792827
Change-Id: I6a3ce877cdff2496087b97b191a9bfd5b0792827
  (cherry-picked from ag/13973146)

junyulai   commited 2021-04-29 18:19:55 +08:00
177dc86ad1
Update sources of Tethering module since it is renamed
framework-tethering-shared-srcs is named to
framework-connectivity-shared-srcs so update
source section to include correct file group.

Ignore-AOSP-First: changes in topic has conflicts in sc-dev
Bug: 177046265
Test: FrameworksNetTests
Change-Id: I81e2af0cc3b37af16b03c1288eb0591b7ed65cc4
Merged-In: I81e2af0cc3b37af16b03c1288eb0591b7ed65cc4
Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a

Aaron Huang   commited 2021-03-11 07:36:55 +00:00
b401e58a1e
Add dependency on system API in connectivity
The system API are moved to the connectivity module: add dependency on
the stubs from framework-tethering.

This only allows tethering to depend on system API defined by the
connectivity classes, not on any private code, even if they are
eventually bundled in the same APEX.

Bug: 171540887
Test: m

Merged-In: Iebfb3e01c5d2480e84edcfc76cf489520bd60237
Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a
(clean cherry-pick from internal branch)

Change-Id: Iebfb3e01c5d2480e84edcfc76cf489520bd60237

Remi NGUYEN VAN   commited 2021-02-26 19:36:06 +09:00
74b274424a
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity"
Bob Badour   authored and   Gerrit Code Review   commited 2021-02-19 06:23:22 +00:00
f5b346ed1d
Merge "Use networkstack_client instead of aidl_interface"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-02-18 13:31:54 +00:00
319064f284
[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity
Added SPDX-license-identifier-Apache-2.0 to:
  Tethering/Android.bp
  Tethering/apex/Android.bp
  Tethering/bpf_progs/Android.bp
  Tethering/common/TetheringLib/Android.bp
  Tethering/tests/Android.bp
  Tethering/tests/integration/Android.bp
  Tethering/tests/mts/Android.bp
  Tethering/tests/privileged/Android.bp
  Tethering/tests/unit/Android.bp
  tests/cts/hostside/Android.bp
  tests/cts/hostside/aidl/Android.bp
  tests/cts/hostside/app/Android.bp
  tests/cts/hostside/app2/Android.bp
  tests/cts/hostside/certs/Android.bp
  tests/cts/net/Android.bp
  tests/cts/net/api23Test/Android.bp
  tests/cts/net/appForApi23/Android.bp
  tests/cts/net/jni/Android.bp
  tests/cts/net/native/dns/Android.bp
  tests/cts/net/native/qtaguid/Android.bp
  tests/cts/net/util/Android.bp
  tests/cts/tethering/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I8534c580f0e2a17be146300b67b3604817b64507

Bob Badour   commited 2021-02-16 04:09:58 -08:00
97e6be27f6