Remi NGUYEN VAN
4cda76cdb9
Merge "Revert "Add owners block for migration"" am: 43740568b6 am: dc4690f77e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722671
Change-Id: Ib7698688fe1dec6f534a6571c715c4989a93fada
2021-06-03 09:13:30 +00:00
Remi NGUYEN VAN
1f0e609863
[automerger skipped] Skip merge of: Merge fixed history of Connectivity am: 689b08d86d -s ours
...
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809399
Change-Id: Iba158f969b1dcb27804e4be08f836ed3df6694fd
2021-06-03 09:13:22 +00:00
Remi NGUYEN VAN
d1b1cd0961
[automerger skipped] Merge fixed history of Connectivity am: 04a96452cf -s ours
...
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809394
Change-Id: I82710ff2ce1c9176cb9dbacc7df5836199cce9b3
2021-06-03 09:13:11 +00:00
Remi NGUYEN VAN
dc4690f77e
Merge "Revert "Add owners block for migration"" am: 43740568b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722671
Change-Id: I0e59f2b9a9903f12229baeab2a47d49b213ea7f9
2021-06-03 08:13:23 +00:00
Remi NGUYEN VAN
689b08d86d
Skip merge of: Merge fixed history of Connectivity
...
This merges commit b2f2271ef1 with
"-s ours"
Bug: 186628461
Test: TH
Ignore-AOSP-First: per-branch merges
Merged-In: I9f798dd3a96c917001d52e6167fceb59885ce6f0
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I36d8f58d5cc16d32d3927976394a732945de4767
2021-06-03 11:04:09 +09:00
Remi NGUYEN VAN
04a96452cf
Merge fixed history of Connectivity
...
Bug: 189375701
Bug: 186628461
TEST: TH
Ignore-AOSP-First: per-branch merges
Merged-In: I9f798dd3a96c917001d52e6167fceb59885ce6f0
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I517c9af0f644ee59abebf56b6acce772c19b368d
2021-06-03 10:51:41 +09:00
Aaron Huang
4a3eb4e02c
Merge "Remove framework-connectivity-annotations library" into sc-dev am: 059ddb4025
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731888
Change-Id: I350a2b3cf64110d941472fc8eb25beefdb6743f0
2021-06-01 08:20:24 +00:00
Aaron Huang
059ddb4025
Merge "Remove framework-connectivity-annotations library" into sc-dev
2021-06-01 08:08:21 +00:00
TreeHugger Robot
585c1b72d8
Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev am: 98c351f429
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14452540
Change-Id: I92bceef971050f9afc1fea0e1f3a3e6f4391db5f
2021-06-01 08:06:28 +00:00
TreeHugger Robot
98c351f429
Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev
...
* changes:
Add CTS for NetworkScore.setTransportPrimary
Add some CTS tests for NetworkScore.
Add a first CTS for NetworkScore
2021-06-01 07:41:17 +00:00
Aaron Huang
cff22949d2
Remove framework-connectivity-annotations library
...
This library can be removed because the annotations are no longer
used out of module.
@RestrictBackgroundStatus and @MultipathPreference are defined
in connectivity mainline module. Annotate these in non-updatable
platform is not going to be manageable long term. For example,
if the module gets updated and the annotation gets more values
then it's a problem in non-updatable platform. So, it should
not have IntDef cross module boundaries.
Ignore-AOSP-First: AOSP doesn't include this change yet
Bug: 183972925
Test: build
Change-Id: I63f1fde73c4ffdaff9fda914e33cbb5a110ba64e
2021-06-01 06:47:47 +00:00
Chiachang Wang
fdef75e1c4
[automerger skipped] Merge "Unify the verification for unregister a NetworkAgent" into sc-dev am: 1084882539 -s ours
...
am skip reason: Merged-In I66d8e5a0fa1e2245711e8ac90d9daca24802e399 with SHA-1 f9093389f5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14706912
Change-Id: Idf3c1effc91ef2154ea7361bb9f4c49416d6c70a
2021-06-01 02:33:56 +00:00
Chalard Jean
ee93b3d3b3
Add CTS for NetworkScore.setTransportPrimary
...
Ignore-AOSP-First: NetworkScore incomplete in AOSP
Bug: 184037351
Test: this
Change-Id: I81bf8969ace3cb6826b30c5bbd0b896c64c73c57
2021-06-01 02:20:57 +00:00
Chalard Jean
2d2ecc3cfb
Add some CTS tests for NetworkScore.
...
Ignore-AOSP-First: NetworkScore incomplete in AOSP
Bug: 184037351
Test: this
Change-Id: I2edba51351cd4c71727663aa85b1d5141bff2a15
2021-06-01 02:20:54 +00:00
Chalard Jean
aac204b202
Add a first CTS for NetworkScore
...
In an effort to make reviewing easier, this implements most of
the infra but only a mostly trivial test.
Ignore-AOSP-First: NetworkScore incomplete in AOSP
Bug: 184037351
Test: this
Change-Id: Ibb9139798ce44d748e87bae79a1e23311ec8d9b6
2021-06-01 02:20:26 +00:00
Chiachang Wang
1084882539
Merge "Unify the verification for unregister a NetworkAgent" into sc-dev
2021-06-01 02:09:37 +00:00
Remi NGUYEN VAN
43740568b6
Merge "Revert "Add owners block for migration""
2021-06-01 00:05:06 +00:00
Robert Greenwalt
6516f1007d
am 4ad1f0d3: (-s ours) Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev am: e1023fe0ce
...
Original change: undetermined
Change-Id: Ic0e47cd530b41f69f6debea1d7b9326a87fad3ca
2021-05-31 14:44:36 +00:00
Robert Greenwalt
9ebfca0946
am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev am: bb0ec47862
...
Original change: undetermined
Change-Id: I988df4ab7f5ba54473ecbe860bbbf0ea47e17bc7
2021-05-31 14:44:19 +00:00
Robert Greenwalt
85e2250f4a
am fe5ca964: (-s ours) Merge "Fix public API of LinkProperties." into lmp-preview-dev am: b891bcca1f
...
Original change: undetermined
Change-Id: I732332071460200fa37a5eb91f655e9a18d64a15
2021-05-31 14:44:03 +00:00
Sreeram Ramachandran
dc52d7adc6
Fix wifi connectivity issues. am: 96151d642e
...
Original change: undetermined
Change-Id: I199eafa5702c1f804c1de8a0a2b2e45095e7f448
2021-05-31 14:43:40 +00:00
Robert Greenwalt
f9400fca12
am bcf103d0: Merge "Apply API review to android.net.Network:" into lmp-preview-dev am: 15610080b1
...
Original change: undetermined
Change-Id: I2b706f3e1fddd0d357b84db9a51dbfdce6346538
2021-05-31 14:43:24 +00:00
Lorenzo Colitti
807cd4b46c
Minor changes to the LinkAddress API docs. am: b0116bf5bf
...
Original change: undetermined
Change-Id: I0eee1ccd56b11bee33fbf072480f65ef997f9702
2021-05-31 14:43:09 +00:00
Sreeram Ramachandran
c637291aea
Add a new IpPrefix class and use it in RouteInfo. am: 887d7b1d5a
...
Original change: undetermined
Change-Id: I0145e9118a58ad4bfbcd7776fc2b8c8f9b4d3efc
2021-05-31 14:42:56 +00:00
Amit Mahajan
de2e215868
resolved conflicts for merge of 1f65550f to master am: 93a3aad019
...
Original change: undetermined
Change-Id: I5d13736481bc53137c09a741f209be26b8d8872d
2021-05-31 14:42:39 +00:00
vandwalle
9fd57bdd30
Merge "remember and report network score" am: b112882ab4
...
Original change: undetermined
Change-Id: I1c9636cad2a15eec4686b2a7501a0ef647d07442
2021-05-31 14:42:23 +00:00
Robert Greenwalt
c2421f735a
Merge "Apply API review to android.net.Network:" am: dc69ebdf94
...
Original change: undetermined
Change-Id: I3d7b5dec59d10acd1d196be2a5502a6e0ab58efe
2021-05-31 14:42:00 +00:00
Robert Greenwalt
77179bf58d
Fix public API of LinkProperties. am: 69aceaf7f2
...
Original change: undetermined
Change-Id: Ic67da64d0abb776a89a42d0a1af252f90f88b6d0
2021-05-31 14:40:03 +00:00
Robert Greenwalt
eeb4c3a2c5
Fix the marking of restricted network requests am: 4a52c697d2
...
Original change: undetermined
Change-Id: Iaa457497997cfe2d338015c37cbac41f2692c941
2021-05-31 14:39:47 +00:00
Robert Greenwalt
a12d03dde9
am d060ac14: (-s ours) Merge "DO NOT MERGE Report new network scores back to factories." into lmp-preview-dev am: 84e2f28f33
...
Original change: undetermined
Change-Id: If8bb30f167392b7f8633d7af8e7de327d8c3c77a
2021-05-31 14:39:32 +00:00
Robert Greenwalt
4e4cfd074a
am 02006632: Merge "Call a network restricted only if all capabilities are restricted" into lmp-preview-dev am: b344398404
...
Original change: undetermined
Change-Id: Ib6d3d54c56ac1e6cc1988a832702ee22230d331d
2021-05-31 14:39:17 +00:00
Robert Greenwalt
2281fa6a1d
Merge "Report new network scores back to factories." am: 879bd9484d
...
Original change: undetermined
Change-Id: I8accfee4554a2bfe7cd044938bfdb2d702ab8013
2021-05-31 14:39:02 +00:00
Lorenzo Colitti
923b6d9f25
am 7a3077a9: Merge "Make requests for restricted networks not require unrestricted access." into lmp-preview-dev am: 33920d2516
...
Original change: undetermined
Change-Id: I8b1a74c8a840f8b58621d20aeeba37795e8ad3c9
2021-05-31 14:38:37 +00:00
Robert Greenwalt
a867bd07fa
am cffe6d73: Merge "Fix legacy APIs." into lmp-preview-dev am: b5a1be98de
...
Original change: undetermined
Change-Id: Iadf050c5fd9eaf84f70d3b3e4a41dba7247aeec1
2021-05-31 14:38:21 +00:00
Robert Greenwalt
2f2c547750
am e8f910c6: Fix Legacy NetworkInfo API am: 6f82b6b568
...
Original change: undetermined
Change-Id: Iac20ed2f6bbbca3df74e5970fafc8170dd284709
2021-05-31 14:38:07 +00:00
Robert Greenwalt
ab83f7ec91
am ead9aa35: Merge "Refactor NetworkFactory." into lmp-preview-dev am: 903141778b
...
Original change: undetermined
Change-Id: Ief3baf39ad942574f63ce192e4182dc7f09de660
2021-05-31 14:37:51 +00:00
Robert Greenwalt
6764ead329
am 5fc756c3: (-s ours) Merge "Rewrite startUsingNetworkFeature for new API" into lmp-preview-dev am: 7beba3f55c
...
Original change: undetermined
Change-Id: Id7ce8a80b4ddd9589423939df50df4608767d0ff
2021-05-31 14:37:34 +00:00
Robert Greenwalt
5e042bc44e
Fix Legacy NetworkInfo API am: 03f23bfe91
...
Original change: undetermined
Change-Id: I5818e26ce6686d8dd2e165862990b42d6168b39a
2021-05-31 14:37:15 +00:00
Robert Greenwalt
41440e693c
Refactor NetworkFactory. am: 70cf11649e
...
Original change: undetermined
Change-Id: I72e4cd937e9f6a1408116f9d14f36af0c74a04b3
2021-05-31 14:37:00 +00:00
Robert Greenwalt
990cf49616
Merge "Rewrite startUsingNetworkFeature for new API" am: 857436debf
...
Original change: undetermined
Change-Id: I4abe3a845fa7699914c69f04860437acb19959bb
2021-05-31 14:36:45 +00:00
Sreeram Ramachandran
5f17bf2f61
am 5a734bd7: Merge "Support legacy routes added by apps via ensureRouteToHost()." into lmp-preview-dev am: 36a3584cc6
...
Original change: undetermined
Change-Id: I277c1048b2f76984d5f90905220dc7a72428322b
2021-05-31 14:36:22 +00:00
Sreeram Ramachandran
5e56e8178f
Merge "Support legacy routes added by apps via ensureRouteToHost()." am: 898d27e7c3
...
Original change: undetermined
Change-Id: I0b1040a49d28b93a9e6eedcf6106a07d21d10854
2021-05-31 14:36:08 +00:00
Paul Jensen
2d5ab14b0e
am 4477d6aa: Merge "Adjust Network\'s SocketFactory to restrict host name resolution to that Network" into lmp-preview-dev am: d4fbd78bb0
...
Original change: undetermined
Change-Id: I7d507fbe7a9af17c7127e85adc65d3b34a104ac4
2021-05-31 14:35:45 +00:00
Paul Jensen
f903fe6a01
am 7df1decc: (-s ours) Merge "Implement bind-to-network functionality of android.net.Network." into lmp-preview-dev am: 78af47b1a8
...
Original change: undetermined
Change-Id: I9c35314d9283c0b302918c08530b26d5022177a4
2021-05-31 14:35:29 +00:00
Robert Greenwalt
a1b898de16
am 67cf4bad: Merge "Don\'t break things if a network goes back to CONNECTED." into lmp-preview-dev am: cff4966327
...
Original change: undetermined
Change-Id: Ib0a87f3a5800aa9e3f47844f22d18ce0228f57f4
2021-05-31 14:35:13 +00:00
Lorenzo Colitti
7a0c150c15
Merge "Don't break things if a network goes back to CONNECTED." am: 9cfd04b64a
...
Original change: undetermined
Change-Id: I8ffeb88c7c34fae9bca6001b788aa86979889cf4
2021-05-31 14:34:59 +00:00
Lorenzo Colitti
fecd120b04
am d925573a: (-s ours) Merge "DO NOT MERGE - Support disconnecting while trying to connect." into lmp-preview-dev am: 2bd5d2d8f1
...
Original change: undetermined
Change-Id: Ibcf9c9a84f387844d09171edee4d2eb37fa0b685
2021-05-31 14:34:35 +00:00
Paul Jensen
48b4fd1d1a
Merge "Adjust Network's SocketFactory to restrict host name resolution to that Network" am: 34648fc64d
...
Original change: undetermined
Change-Id: I56c67c46b9b880f812ce10f11fc9871d02a1f6d9
2021-05-31 14:34:21 +00:00
Lorenzo Colitti
008b4dcf72
Merge "Support disconnecting while trying to connect." am: 57a0aba819
...
Original change: undetermined
Change-Id: I2c6523aa5b353501f09715992db9150a8a077443
2021-05-31 14:33:57 +00:00
Dave Langemak
6cb15c2283
am 4a6a8e5e: Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev am: b1adc41e9a
...
Original change: undetermined
Change-Id: I6646f470f0aa7e3cdf06583341c4fa8aa4d46ff5
2021-05-31 14:33:33 +00:00