Commit Graph

2206 Commits

Author SHA1 Message Date
Automerger Merge Worker
06a84d3e78 Merge "Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348 am: 4c2b381adb" into rvc-qpr-dev-plus-aosp am: f2307d2b22
Change-Id: Id8c27769dd4c9ee0d46720b880d73f7259d91102
2020-05-31 15:12:09 +00:00
Paul Duffin
c08e34e516 Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 4a93d5ea3a am: 669e1d848e am: d097fb19b6
Change-Id: I94ce2fa1291a848ff993533bd7a5dd984355da0f
2020-05-31 15:11:42 +00:00
Paul Duffin
e7418a6175 Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348 am: c610401918 am: 005c6cad80
Change-Id: Ia4c804083f6b0db47585aa6491a8c36c4c8ff0aa
2020-05-31 15:11:17 +00:00
Automerger Merge Worker
f2307d2b22 Merge "Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348 am: 4c2b381adb" into rvc-qpr-dev-plus-aosp 2020-05-31 14:59:20 +00:00
Paul Duffin
d097fb19b6 Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 4a93d5ea3a am: 669e1d848e
Change-Id: Ifd6593b8143280da4d5dcda6f457c330df4199d0
2020-05-31 14:59:01 +00:00
Paul Duffin
9b9cc8b44a Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348 am: 4c2b381adb
Change-Id: I50ce359fd4195295dc9eee8df2f39bf536884330
2020-05-31 14:58:56 +00:00
Paul Duffin
005c6cad80 Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348 am: c610401918
Change-Id: I15eb542ecff199567da1d16e9d7c7bc2d1648563
2020-05-31 14:58:37 +00:00
Paul Duffin
669e1d848e Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 4a93d5ea3a
Change-Id: I8ff6bb1b049f96d71612020adccd8c4a6888c178
2020-05-31 14:46:00 +00:00
Paul Duffin
c610401918 Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 408914d348
Change-Id: Ib58ede3af2e2c12b7c5a4fdfde3f74a595e229b4
2020-05-31 14:45:39 +00:00
Paul Duffin
4a93d5ea3a Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5
Change-Id: I385b2d13d96fd34c8fe031994d56de3763fe3917
2020-05-31 14:25:37 +00:00
Paul Duffin
408914d348 Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5
Change-Id: I43891381685098f03005500e9049972c1a3c1b39
2020-05-31 14:25:06 +00:00
Paul Duffin
a17cf677b5 Clean up the visibility rules for framework modules
Switching from java_library to java_sdk_library switched the meaning
of the module name from referring to the implementation library to
referring to the stubs. This change updates the visibility rules to
reflect that new meaning.

Visibility rules that were previously set for the java_library have
been moved to the impl_library_visibility property and the special
//visibility:override value has been prepended to prevent it from
inheriting the values from the visibility property.

Visibility rules set for the stubs (via stubs_library_visibility)
property have been moved to the visibility property.

Bug: 155164730
Test: m nothing
Exempt-From-Owner-Approval: Build cleanup
Change-Id: Icc9bc5a9ef86cf7ba0f15c2b2a4abd596ec9f640
2020-05-31 13:45:51 +01:00
Automerger Merge Worker
f70f3ffc12 Merge "Merge "[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f -s ours" into rvc-d1-dev-plus-aosp am: c291f57f0d -s ours" into rvc-qpr-dev-plus-aosp am: ab1d772f7b -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 2ecd333f59 is in history

Change-Id: I794a70c9efc425ca83b4b0c02f587deef7d75f72
2020-05-31 07:11:20 +00:00
Mark Chien
1c6e7c0fdb [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f am: 2869e393b3 -s ours am: 783c06171d -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 2ecd333f59 is in history

Change-Id: I6b9d75c514c6778939844889dc9c640683fdf828
2020-05-31 07:10:53 +00:00
Mark Chien
db9f95eefd [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 -s ours am: a6d948cf73 -s ours am: 0966a74414 -s ours am: 04b69e59e1 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 c9daba32f7 is in history

Change-Id: Ieb7c9f6255907b338fb67c4a583e1f70e29b42b1
2020-05-30 15:25:33 +00:00
Automerger Merge Worker
ab1d772f7b Merge "Merge "[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f -s ours" into rvc-d1-dev-plus-aosp am: c291f57f0d -s ours" into rvc-qpr-dev-plus-aosp 2020-05-30 15:15:30 +00:00
Automerger Merge Worker
3751843bb8 Merge "[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f -s ours" into rvc-d1-dev-plus-aosp am: c291f57f0d -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 2ecd333f59 is in history

Change-Id: Ie5fd4fd7a00935b82a1e253a190cf3ce3369adcb
2020-05-30 15:15:25 +00:00
Mark Chien
783c06171d [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f am: 2869e393b3 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 2ecd333f59 is in history

Change-Id: I428349d7804d02610177c51d0a532358b661dc66
2020-05-30 15:15:24 +00:00
Mark Chien
04b69e59e1 [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 -s ours am: a6d948cf73 -s ours am: 0966a74414 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 c9daba32f7 is in history

Change-Id: I2d3e65e5a2f709d99be6dfd565215710b64e12b2
2020-05-30 15:15:10 +00:00
Automerger Merge Worker
c291f57f0d Merge "[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f -s ours" into rvc-d1-dev-plus-aosp 2020-05-30 15:03:41 +00:00
Mark Chien
0966a74414 [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 -s ours am: a6d948cf73 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 c9daba32f7 is in history

Change-Id: I7a42ee0b98c9f4b7251b2673609ed89e81722aac
2020-05-30 15:03:34 +00:00
Mark Chien
34656783de [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 c9daba32f7 is in history

Change-Id: I18f6a7b449cffb0e1d6069a0abae15c76396ba72
2020-05-30 15:03:31 +00:00
Mark Chien
8b5a29a30f Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63
Change-Id: I87c8cc92a78ba7bd17581c23e1603ac47391e96e
2020-05-30 14:47:07 +00:00
Mark Chien
a6d948cf73 [automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 c9daba32f7 is in history

Change-Id: I99ca97c91bf2f3705b7295d14f5ddb84d29c84c0
2020-05-30 14:46:40 +00:00
Mark Chien
2ecd333f59 Tethering: ensure downstream prefix do not conflict with upstream
- Add New class PrivateAddressCoordinator to coordinate the private
  address conflict problem.
- Downstream prefix would be random in 192.168.0.0/24 ~
  192.168.255.0/24.
- If new upstream prefix is conflict with existing downstream prefix,
  downstream would be kicked out and it would request a new one.
- The last conflict upstream prefixes would be blacklist. Avoid to
select downstream prefix which is conflict with prefixes in blacklist.

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

Merged-In: Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5
Change-Id: Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5
2020-05-30 03:42:57 +00:00
Mark Chien
c4060a16d2 Merge "Tethering: ensure downstream prefix do not conflict with upstream" am: 7bf51619d8 am: 3cefc6e048 am: 0e1a1f4c68 am: df94b648c8 am: a37347cae9
Change-Id: Ie4a4e389c3f0bc5754eec0ae489833b8cd2fdb83
2020-05-29 22:56:13 +00:00
Mark Chien
a37347cae9 Merge "Tethering: ensure downstream prefix do not conflict with upstream" am: 7bf51619d8 am: 3cefc6e048 am: 0e1a1f4c68 am: df94b648c8
Change-Id: I73efd6bfe5cd362fa9988cb17b9152441721518d
2020-05-29 22:39:37 +00:00
Mark Chien
df94b648c8 Merge "Tethering: ensure downstream prefix do not conflict with upstream" am: 7bf51619d8 am: 3cefc6e048 am: 0e1a1f4c68
Change-Id: Ib77ca516f83ac552429573178f63d08ccfce008e
2020-05-29 22:26:13 +00:00
Mark Chien
0e1a1f4c68 Merge "Tethering: ensure downstream prefix do not conflict with upstream" am: 7bf51619d8 am: 3cefc6e048
Change-Id: Ib70a471603d850069aae029dea7fc09a9b28f4bc
2020-05-29 22:07:37 +00:00
Mark Chien
3cefc6e048 Merge "Tethering: ensure downstream prefix do not conflict with upstream" am: 7bf51619d8
Change-Id: I55ff57be344e17d3ce16cda7291f7f29f26191b1
2020-05-29 21:42:11 +00:00
Chalard Jean
fec854e7f6 Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 601193a68e am: 5ba4e8018e am: b3cee20121
Change-Id: I8865869b94af08463d024b065f94e1594282f8f8
2020-05-29 10:20:11 +00:00
Chalard Jean
a8aa5f0a84 Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 04fb018acc am: fe32a82433 am: b8176a3a07
Change-Id: I2f9ac84362972bdd45929f8b8f3df303c188f20d
2020-05-29 10:17:17 +00:00
Chalard Jean
b3cee20121 Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 601193a68e am: 5ba4e8018e
Change-Id: I419045f62d9d1f15b5764c301dcb190fd6ccc349
2020-05-29 10:01:46 +00:00
Chalard Jean
b8176a3a07 Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 04fb018acc am: fe32a82433
Change-Id: Ie191a6044b8bc04ec558ce192a26027e027bf5e6
2020-05-29 10:00:50 +00:00
Chalard Jean
5ba4e8018e Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 601193a68e
Change-Id: If2085438daf43081c67d5174aca07ed7e3055327
2020-05-29 09:51:40 +00:00
Chalard Jean
fe32a82433 Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd am: 04fb018acc
Change-Id: Idfe54387a331f532040ea3986eb7948e24ea7304
2020-05-29 09:51:14 +00:00
Chalard Jean
04fb018acc Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd
Change-Id: I085ccc0a27d07489daeb91e13c23ccf58e3f7bc0
2020-05-29 09:25:22 +00:00
Chalard Jean
601193a68e Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev am: 88c69840cd
Change-Id: Ice90dba6408eca9c031592fd4933a107fdbbec2f
2020-05-29 09:24:53 +00:00
Chalard Jean
88c69840cd Merge "Use Class#getSimpleName instead of KClass#getSimpleName" into rvc-dev 2020-05-29 09:16:28 +00:00
Automerger Merge Worker
a552cdaac7 Merge "[automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b -s ours am: f1d99b078a -s ours am: 491b0772e1 -s ours" into rvc-qpr-dev-plus-aosp am: dd7b312acc -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 9c9c600c16 is in history

Change-Id: I98b1049075ae56b979b3c5e49fb0e5451e444ac7
2020-05-29 07:17:28 +00:00
Mark Chien
784e446901 [automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b am: 86780d3db9 -s ours am: 6e4df2bbea -s ours am: ee89e03498 -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 908518d8e2 is in history

Change-Id: Ia5df44fa2fb59843313df24fc1613eafe80d0cc5
2020-05-29 07:15:29 +00:00
Mark Chien
27087c713c [automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b -s ours am: f1d99b078a -s ours am: 491b0772e1 -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 9c9c600c16 is in history

Change-Id: I0e0a623ef6a149e1482c341a6987599e326ffe11
2020-05-29 06:50:45 +00:00
Mark Chien
ee89e03498 [automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b am: 86780d3db9 -s ours am: 6e4df2bbea -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 908518d8e2 is in history

Change-Id: Iffcb69ef26033a5d17dcb05a014d98e9dc33cb63
2020-05-29 06:50:12 +00:00
Mark Chien
491b0772e1 [automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b -s ours am: f1d99b078a -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 908518d8e2 is in history

Change-Id: Id4febbdbf75c4acfaa4a62f8124314608fb494b5
2020-05-29 06:38:55 +00:00
Mark Chien
6e4df2bbea [automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b am: 86780d3db9 -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 908518d8e2 is in history

Change-Id: I8e1a67cf3573d0294e5585cb794ea5265a9486a3
2020-05-29 06:38:49 +00:00
Mark Chien
f1d99b078a [automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 908518d8e2 is in history

Change-Id: If8c7dd5b84efc54b5ba4fcbcbed18c1f18009613
2020-05-29 06:25:12 +00:00
Mark Chien
86780d3db9 Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b
Change-Id: I762c9ac79b181a409e6aa2b362665a9f94a62a6d
2020-05-29 06:25:08 +00:00
Mark Chien
40a9eb779b Merge "Extend timeout for requesting tethered interface" into rvc-dev 2020-05-29 06:11:12 +00:00
Mark Chien
7bf51619d8 Merge "Tethering: ensure downstream prefix do not conflict with upstream" 2020-05-29 03:34:45 +00:00
Paul Duffin
c2cb4e2621 [automerger skipped] Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f am: 0135bd56b3 am: a088f4ddfa am: d38049c6c9 -s ours
am skip reason: Change-Id If5c115f482751f9f4b5f047e9e401a18e36799ef with SHA-1 e0b78577f7 is in history

Change-Id: Iaab877f5138b33d86aa0cbcb07d635277d66c6e8
2020-05-28 22:11:07 +00:00