Commit Graph

1530 Commits

Author SHA1 Message Date
Automerger Merge Worker
c660e4c7ce [automerger skipped] Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca29 -s ours am: 2414da664a -s ours
am skip reason: Change-Id Id6051296a02060179666b67fc6ea9092273c1780 with SHA-1 5650a2bcce is in history

Change-Id: I2231c8928c1b6d7dc9d86a8236fc92d0a01b556e
2020-02-25 15:21:07 +00:00
Automerger Merge Worker
7a1bcc395c [automerger skipped] Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca29 am: b42d60fd69 -s ours
am skip reason: Change-Id Iad504f0e709daadfb4d86205c07f0faf429f5a8f with SHA-1 9e0792f8dc is in history

Change-Id: I429437983edfa4d85aa2f9bfc90500cfbf330f62
2020-02-25 15:20:50 +00:00
Automerger Merge Worker
2414da664a [automerger skipped] Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca29 -s ours
am skip reason: Change-Id Iad504f0e709daadfb4d86205c07f0faf429f5a8f with SHA-1 9e0792f8dc is in history

Change-Id: Ibbaee439a2a67747297fd4e344dd90a48b150c0f
2020-02-25 15:14:39 +00:00
Automerger Merge Worker
7d4fbeaa9c Merge "[SP19] Reduce log when set limit and request stats update" am: 9821f7e940 am: eebf830623 am: cb3c305fd1 am: 839bea957d
Change-Id: Iae5a94e9c351f17f652e7047bcfee94e719d9aca
2020-02-25 10:23:25 +00:00
Automerger Merge Worker
839bea957d Merge "[SP19] Reduce log when set limit and request stats update" am: 9821f7e940 am: eebf830623 am: cb3c305fd1
Change-Id: If87d0e7759a88f037c7a115c499b6cb55b81bcda
2020-02-25 10:08:54 +00:00
Automerger Merge Worker
cb3c305fd1 Merge "[SP19] Reduce log when set limit and request stats update" am: 9821f7e940 am: eebf830623
Change-Id: I92d214f4648fec6be13e04147290ecdd156fab4e
2020-02-25 09:48:22 +00:00
Automerger Merge Worker
5650a2bcce Build framework-tethering against module_current
Bug: 146757305
Test: build

Change-Id: Id6051296a02060179666b67fc6ea9092273c1780
Merged-In: Id6051296a02060179666b67fc6ea9092273c1780
Merged-In: Iad504f0e709daadfb4d86205c07f0faf429f5a8f
(cherry picked from commit bb09ceaf09c8aea00a5001ba7079c13a2575e809)
2020-02-25 09:47:25 +00:00
Treehugger Robot
9821f7e940 Merge "[SP19] Reduce log when set limit and request stats update" 2020-02-25 09:14:24 +00:00
Jooyung Han
cfea439ba4 tethering: transitive deps from jni_libs
The build system collects transtive deps from jni_libs for APKs.
No need to list them explicitly in android_app definition.

Bug: 146992436
Test: m com.android.tethering
      deapexer extract com.android.tethering.apex apex
      unzip apex/priv-app/Tethering/Tethering.apk -u apk
      ls apk/lib/arm64-v8a

Change-Id: Icba6ea3611c443cbf22ad6363d0239377d16ac9e
2020-02-25 17:35:18 +09:00
junyulai
fd4a2f0528 [SP19] Reduce log when set limit and request stats update
setLimit can be ignored if the quota is unlimited and not
changed, and the log could be omitted since it will still be
logged in HAL. Request stats update will print error log in
service if it is not correctly responded in time.

Test: atest TetheringTests
Test: manual
Fix: 149735152

Change-Id: I01c0191d5b89942fa69b167b8a6b40ed2821300b
2020-02-25 15:02:10 +08:00
Automerger Merge Worker
da0166cc30 Merge changes I4a624ea4,I8626932e am: 0f0bff0594 am: a081a0cbab am: e27c87a4ff am: 8d30627e9c
Change-Id: I6090c56974803c64897ca545049c3e024da66239
2020-02-25 04:26:22 +00:00
Automerger Merge Worker
07eeb5b79b Merge "Build framework-tethering against module_current" am: 6deeff3406 am: bb0fc42dc1 am: c60748f497 am: 09a58dad94
Change-Id: I4a0e6235d2c0a9bd4453cbce26cca6b9dbc5acdb
2020-02-25 04:25:10 +00:00
Automerger Merge Worker
8d30627e9c Merge changes I4a624ea4,I8626932e am: 0f0bff0594 am: a081a0cbab am: e27c87a4ff
Change-Id: Id6c92b565e1f7573ee25cdc785934a8ef4c3121c
2020-02-25 04:17:54 +00:00
Automerger Merge Worker
09a58dad94 Merge "Build framework-tethering against module_current" am: 6deeff3406 am: bb0fc42dc1 am: c60748f497
Change-Id: I36e79f35c297261b19a58cc76dffad5f52172f1c
2020-02-25 04:16:52 +00:00
Automerger Merge Worker
e27c87a4ff Merge changes I4a624ea4,I8626932e am: 0f0bff0594 am: a081a0cbab
Change-Id: I691053b22cb0b20e49419212f378cc473b1f35dc
2020-02-25 04:04:44 +00:00
Automerger Merge Worker
c60748f497 Merge "Build framework-tethering against module_current" am: 6deeff3406 am: bb0fc42dc1
Change-Id: I5e0c2e973fb79692ad245a74def946865caedfcc
2020-02-25 04:03:45 +00:00
Lorenzo Colitti
0f0bff0594 Merge changes I4a624ea4,I8626932e
* changes:
  Fix a logic error in IpServerTest#addRemoveipv6ForwardingRules
  Clear IPv6 forwarding rules when losing upstream or stopping.
2020-02-25 03:54:59 +00:00
Lorenzo Colitti
6c8147ea56 Fix a logic error in IpServerTest#addRemoveipv6ForwardingRules
When checking that link-local and multicast neighbours are
ignored, make sure the test neighbours are added on the correct
interface. Otherwise, they might be ignored because events on the
wrong interface are ignored, and not necessarily because
link-local and multicast neighbours are ignored.

Test: atest TetheringTests
Change-Id: I4a624ea4ce9ee9a9352afccbc7bf866587d4cdfa
2020-02-25 09:26:36 +09:00
Lorenzo Colitti
c61fc087b2 Clear IPv6 forwarding rules when losing upstream or stopping.
Test: new unit test
Change-Id: I8626932e43e0daa300dad5fe6a81f47a6d667030
2020-02-25 09:26:36 +09:00
markchien
9e0792f8dc Build framework-tethering against module_current
Test: build
Change-Id: Iad504f0e709daadfb4d86205c07f0faf429f5a8f
2020-02-25 00:22:44 +08:00
Jiyong Park
477b4734f5 Mark updatable APEXes
Mark updatable APEXes as updatable: true so that they are opted-out from
optimizations that make sense only for non-updatable modules; such as
symlinking to the libs in the system partition.

Bug: 149805758
Test: m and check that there is no symlink from the APEX to the system
partition.

Change-Id: Idb55300a60a261c7bb6359439ed220ff51fcf06c
2020-02-24 21:10:56 +09:00
Automerger Merge Worker
4938d62fb3 Merge "Support losing the upstream in IpServerTest." am: a429d3b551 am: fc63250a1a am: b3d6f2d23f am: d92a277e48
Change-Id: Ib5ce27915db43e074253457733b8ea662174a3f1
2020-02-23 11:21:07 +00:00
Automerger Merge Worker
d92a277e48 Merge "Support losing the upstream in IpServerTest." am: a429d3b551 am: fc63250a1a am: b3d6f2d23f
Change-Id: Ic241e4f7d0356910fe47e8c4b9fbc694270836d0
2020-02-23 11:06:06 +00:00
Automerger Merge Worker
b3d6f2d23f Merge "Support losing the upstream in IpServerTest." am: a429d3b551 am: fc63250a1a
Change-Id: Ic77f0af05fe094485ce78fd44c2f2d009a257164
2020-02-23 10:56:48 +00:00
Lorenzo Colitti
a429d3b551 Merge "Support losing the upstream in IpServerTest." 2020-02-23 10:18:02 +00:00
Automerger Merge Worker
d09af87e6c Merge "[automerger skipped] Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 410a97588b am: d48f0fd4f3 -s ours am skip reason: Change-Id I36cf007a4813027721dfb6389e10cf95085f85e4 with SHA-1 050ccee922 is in history" into rvc-qpr-dev-plus-aosp 2020-02-22 17:54:37 +00:00
Automerger Merge Worker
23a5179926 Merge "Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 8736469373 am: 742e5df141" into rvc-qpr-dev-plus-aosp 2020-02-22 17:54:33 +00:00
Automerger Merge Worker
29b291f2cb [automerger skipped] Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 410a97588b am: d48f0fd4f3 -s ours
am skip reason: Change-Id I36cf007a4813027721dfb6389e10cf95085f85e4 with SHA-1 050ccee922 is in history

Change-Id: I728a40b68c6b16736d7b537883a0ea9206af585d
2020-02-22 17:54:33 +00:00
Automerger Merge Worker
ca76d9849c Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 8736469373 am: 742e5df141
Change-Id: I12a4318efeb907a9b700789d095c7f3308e14b1e
2020-02-22 17:54:29 +00:00
Automerger Merge Worker
b1c2de0091 Merge "Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 8736469373" into rvc-d1-dev-plus-aosp am: 604719b900
Change-Id: Idd3e780002264163be64bfe757ea56532b915eb7
2020-02-22 17:54:27 +00:00
Automerger Merge Worker
d48f0fd4f3 Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 410a97588b
Change-Id: Ib37e75e06b9a6bc6690e701652c659d8ed0fc580
2020-02-22 17:46:17 +00:00
Automerger Merge Worker
c0f9221946 Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0 am: 8736469373
Change-Id: I9ed8840ffeeedf61610a4e61ab63542781f21f1b
2020-02-22 17:46:08 +00:00
Automerger Merge Worker
410a97588b Merge "Re-submit "Create all variants of stubs for wifi"" into rvc-dev am: b629d69db0
Change-Id: I5a5940bb2737607166cdfccbce521a67e8afcaa8
2020-02-22 17:36:36 +00:00
Automerger Merge Worker
daf85d8bc6 Merge "Remove liblog from Tethering jni_libs" am: 044edce140 am: 00f848a922 am: 95f0c3b2a4 am: fb47553f96
Change-Id: Ia29b918afed1256232204fa33472f780bbf10495
2020-02-22 12:38:01 +00:00
Automerger Merge Worker
fb47553f96 Merge "Remove liblog from Tethering jni_libs" am: 044edce140 am: 00f848a922 am: 95f0c3b2a4
Change-Id: If87a6319e73e9feabbdd469ff3505ce6a823baf9
2020-02-22 12:23:05 +00:00
Automerger Merge Worker
95f0c3b2a4 Merge "Remove liblog from Tethering jni_libs" am: 044edce140 am: 00f848a922
Change-Id: Ied050a4ace8ede214e10e842c44bbdebb0f875ed
2020-02-22 12:11:26 +00:00
Anton Hansson
050ccee922 Re-submit "Create all variants of stubs for wifi"
Use sdk_version: module_current instead.

This reverts commit d20f03011f95bd04bace0977d246cdc737ce5627.

Bug: 147768409
Test: m
Test: build/soong/soong_ui.bash --make-mode dist ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Exempt-From-Owner-Approval: clean cp
Change-Id: I36cf007a4813027721dfb6389e10cf95085f85e4
Merged-In: I36cf007a4813027721dfb6389e10cf95085f85e4
(cherry picked from commit 21f0ed2a0aceddd4ce3dfcf792cb1ae9a144547b)
2020-02-22 11:05:37 +00:00
Colin Cross
131380ff26 Remove liblog from Tethering jni_libs
Tethering's JNI libraries use the NDK version of liblog, it should
not package the platform version of liblog into the APK.

Bug: 149591340
Test: m checkbuild
Change-Id: If208c1078d2755907f57d7853a5c545bf12458c2
2020-02-21 14:49:40 -08:00
Automerger Merge Worker
3bd7306154 Merge "Use exposed permission defintion in Tethering" am: f1a0c3abea am: e8f538b03a am: d53db580d7
Change-Id: Ieba1160f9f333ac9b112941a8fdcc15e9b563d5b
2020-02-21 12:21:04 +00:00
Lorenzo Colitti
03a734f352 Support losing the upstream in IpServerTest.
Allow dispatchTetherConnectionChanged to pass in a null
upstream interface and/or null LinkProperties. This will allow
future tests to check what happens when the upstream interface
goes away.

Test: test-only change
Change-Id: I7cfc32d072f23644159d33700d6cd830c426ea19
2020-02-21 20:23:59 +09:00
Chiachang Wang
1784f25df5 Use exposed permission defintion in Tethering
The permissions are checked by Tethering; mainline modules should be
able to do permission checks based on these permissions.

Bug: 135411507
Test: m
Change-Id: Ib7f2aedfaaa909bbc356196114c62af9345f2593
2020-02-21 17:50:18 +08:00
Automerger Merge Worker
8a6e5c57b1 Merge "Stop exposing constructor of TetheringConstants" am: e19cd8f3ab am: f2472fa7aa am: 051bd7f721
Change-Id: If4cf11820b0d712584e7ee393c26c7c359d7952f
2020-02-20 13:27:19 +00:00
Automerger Merge Worker
867616df5d [automerger skipped] Merge "Stop exposing generated AIDL from Tethering" am: 703048d08b am: fdbd820293 am: 4cfcbfa7ec -s ours
am skip reason: Change-Id Ia4222fa35a9a2f3c75cebb12f75c536f27e2fe16 with SHA-1 e814258f09 is in history

Change-Id: I51ef292d3a4d28c62bbe8156b907183a0b56208b
2020-02-20 12:56:40 +00:00
Mark Chien
e19cd8f3ab Merge "Stop exposing constructor of TetheringConstants" 2020-02-20 12:46:19 +00:00
Anton Hansson
703048d08b Merge "Stop exposing generated AIDL from Tethering" 2020-02-20 12:18:34 +00:00
Anton Hansson
62d3e5c218 Merge "Stop exposing generated AIDL from Tethering" 2020-02-20 10:41:29 +00:00
markchien
1bec13e963 Stop exposing constructor of TetheringConstants
Fully-static utility classes must not have constructor.

Bug: 149430003
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I18e1129ef8717211d667ccd3b4110169dd7905b4
2020-02-20 16:11:35 +08:00
Automerger Merge Worker
cce2909d0f Merge "Tethering: Don't crash if wifi unavailable." am: 084e8536d1 am: b1b7db8c76 am: 911b4cf5cd
Change-Id: I62927826271d36eb89f39ac076f0bf9522a61423
2020-02-20 04:29:18 +00:00
Automerger Merge Worker
6bc4e1f98c Merge "Tethering offload: add/remove IPv6 forwarding rules on ND events." am: 9a1f9d4669 am: 8d78f124e7 am: 2353495350
Change-Id: If7947436f2a26786f69377712ad0ff1234ac93fe
2020-02-19 23:12:04 +00:00
Automerger Merge Worker
696580b598 Merge "Minimal support for IPv6 upstreams in IpServer tests." am: ffd4bf34be am: 21d63cba5b am: 954d0c274f
Change-Id: Iba46592442663cdc9b69aa2c5cb1ea0893f8f087
2020-02-19 23:11:42 +00:00