Remi NGUYEN VAN
5e40dee9a2
[automerger skipped] Merge fixed history of Connectivity am: 8c05c9ec88 -s ours
...
am skip reason: Merged-In Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c with SHA-1 8af1002b83 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809392
Change-Id: I53cc5316ae34a626a4e9574e31d3a089e5eb84e8
2021-06-04 00:17:38 +00:00
TreeHugger Robot
0c83d9bddf
Merge changes I1de322c9,Id0983d4b into sc-dev am: 4914db6830 am: 29a6df2088
...
Original change: undetermined
Change-Id: I2f73398983466d413c6c9b98cd8229f340bd50d9
2021-06-04 00:17:31 +00:00
TreeHugger Robot
303e953193
Merge "Check location permission for ConnDiags last." into sc-dev am: e90a19e611 am: 1f363995fc
...
Original change: undetermined
Change-Id: I54231daf2b222f1e8e7f79d7f0e52f5fe3b95364
2021-06-04 00:17:10 +00:00
Remi NGUYEN VAN
8b5a75558f
[automerger skipped] Merge "Add NDK API for getprocnetwork" am: ae471dd3f2 am: 5a1053d423 -s ours am: 22729195ed -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722734
Change-Id: I79580eeeb9d184f5656f26d19ff4d1e376677679
2021-06-03 09:57:27 +00:00
Remi NGUYEN VAN
22729195ed
[automerger skipped] Merge "Add NDK API for getprocnetwork" am: ae471dd3f2 am: 5a1053d423 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722734
Change-Id: Iaa13da17466a4d9c521ba6de04eb6f895d21bf7a
2021-06-03 09:41:04 +00:00
Remi NGUYEN VAN
5a1053d423
Merge "Add NDK API for getprocnetwork" am: ae471dd3f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722734
Change-Id: Id05c47d9a6eed0434bdf0c9b9377810036b321c7
2021-06-03 09:36:31 +00:00
vichang
376b2565a6
[automerger skipped] Merge "Use updated NetworkEventDispatcher API" am: 952eed1278 am: 729f247849 -s ours am: 788f0a517a -s ours
...
am skip reason: Merged-In Iae3cec4f751e1f74ccd26db6f22f55cf21dfc04a with SHA-1 1f4fa9ffd5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719611
Change-Id: Iffcd5408b288d3af0f67e0779aed4b1a6936d68b
2021-06-03 09:31:45 +00:00
Chiachang Wang
a7b9de4ea1
Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0 am: b675eba4c1 am: a3df1ed5f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711429
Change-Id: I801108af0f1d7ac4b6adaacfc41ffc5856df796a
2021-06-03 09:31:28 +00:00
Treehugger Robot
3b2e63de71
[automerger skipped] Merge "Test tethered callback with TetheringInterface" am: c4d26414f8 am: f5590e79e3 -s ours am: 3ae845be9d -s ours
...
am skip reason: Merged-In I2a0b8c43fb340c3eaed7f0f90464199222a24280 with SHA-1 82f99f95b7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722733
Change-Id: If818939f33461c336cb846bc0111be2b65eac290
2021-06-03 09:31:24 +00:00
Treehugger Robot
7873cc0ad8
[automerger skipped] Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9 am: ceca234921 -s ours am: 66895c05ae -s ours
...
am skip reason: Merged-In I91bcccd676d109c1b974497ac29bd366a41b8899 with SHA-1 9935dbe03e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708093
Change-Id: Ie8d9419ca3c8cdc1d5c9fbc1c127c38b452d0f2b
2021-06-03 09:31:19 +00:00
Aaron Huang
9fda64e8b1
[automerger skipped] Merge "Add required permission to Tethering" am: 87f051bfa6 am: c84ed50376 -s ours am: 7aa12de842 -s ours
...
am skip reason: Merged-In I40b45a0f1b44fba0b68e94811d14725a59ed4e59 with SHA-1 a546d85a03 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688267
Change-Id: I5a95487db3111a4e3006f474249feddec7a3f025
2021-06-03 09:25:35 +00:00
Remi NGUYEN VAN
2a5fcc26aa
Merge "Revert "Add owners block for migration"" am: 43740568b6 am: dc4690f77e am: 4cda76cdb9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722671
Change-Id: I83fccf1eb71aa56bd8b2b196f8ceee53f8a25d03
2021-06-03 09:25:17 +00:00
Remi NGUYEN VAN
ec6a29f078
[automerger skipped] Skip merge of: Merge fixed history of Connectivity am: 689b08d86d -s ours am: 1f0e609863 -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: I0ba58fbb752b1840f952385127d31b0c8faab030
2021-06-03 09:25:09 +00:00
Remi NGUYEN VAN
76f1c7fec9
[automerger skipped] Merge fixed history of Connectivity am: 04a96452cf -s ours am: d1b1cd0961 -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: Ifdd570e70052ec82c211fab2f5ae9a959a187f2b
2021-06-03 09:24:56 +00:00
vichang
788f0a517a
[automerger skipped] Merge "Use updated NetworkEventDispatcher API" am: 952eed1278 am: 729f247849 -s ours
...
am skip reason: Merged-In Iae3cec4f751e1f74ccd26db6f22f55cf21dfc04a with SHA-1 1f4fa9ffd5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719611
Change-Id: I08f0c128337837b3fa543d61a23c0d70ab674d9d
2021-06-03 09:22:52 +00:00
Chiachang Wang
a3df1ed5f1
Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0 am: b675eba4c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711429
Change-Id: Iede15400f50e5e0f37a95f59b924d8b7dd698509
2021-06-03 09:22:36 +00:00
Treehugger Robot
3ae845be9d
[automerger skipped] Merge "Test tethered callback with TetheringInterface" am: c4d26414f8 am: f5590e79e3 -s ours
...
am skip reason: Merged-In I2a0b8c43fb340c3eaed7f0f90464199222a24280 with SHA-1 82f99f95b7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722733
Change-Id: I28503e9bec154854b69e7c15c2e23a8782e50ac5
2021-06-03 09:19:30 +00:00
vichang
729f247849
Merge "Use updated NetworkEventDispatcher API" am: 952eed1278
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719611
Change-Id: I001a7efddd9e783ce054f740d34c679fe27b0131
2021-06-03 09:17:18 +00:00
Treehugger Robot
66895c05ae
[automerger skipped] Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9 am: ceca234921 -s ours
...
am skip reason: Merged-In I91bcccd676d109c1b974497ac29bd366a41b8899 with SHA-1 9935dbe03e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708093
Change-Id: Icc0d493d7c6ff7e7dcf444309676ca8453c0894a
2021-06-03 09:14:57 +00:00
Aaron Huang
7aa12de842
[automerger skipped] Merge "Add required permission to Tethering" am: 87f051bfa6 am: c84ed50376 -s ours
...
am skip reason: Merged-In I40b45a0f1b44fba0b68e94811d14725a59ed4e59 with SHA-1 a546d85a03 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688267
Change-Id: Ie19938c1988a946b2d1acf66a6bfcb7fa4cab3d6
2021-06-03 09:13:47 +00:00
Chiachang Wang
b675eba4c1
Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711429
Change-Id: Ib1aa32fbf6f2904bd88c418af51db8128ec0bfc2
2021-06-03 09:13:38 +00:00
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
TreeHugger Robot
8daeb7df73
Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 0621a3e18e am: e2e7dcc0d7
...
Original change: undetermined
Change-Id: I98f57bee1e15806462ca663ef80fff3a79620036
2021-06-03 09:13:26 +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
TreeHugger Robot
7d959ef64e
Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f am: 2de3812370
...
Original change: undetermined
Change-Id: Ic36ed3bb92503a6abc76e7ed21a13a7bb752bb13
2021-06-03 09:13:04 +00:00
Treehugger Robot
f5590e79e3
Merge "Test tethered callback with TetheringInterface" am: c4d26414f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722733
Change-Id: If6863c282c259c3fbc6fd3a3f8fc7e4b2510ee23
2021-06-03 09:10:47 +00:00
Treehugger Robot
ceca234921
Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708093
Change-Id: I83a86395d6dd2b2f0a0e8f49e2045508307ac5e7
2021-06-03 09:07:03 +00:00
Aaron Huang
c84ed50376
Merge "Add required permission to Tethering" am: 87f051bfa6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688267
Change-Id: I68b7063f0689407c2259a2387c6bfe6567dc83da
2021-06-03 08:14:34 +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
ae471dd3f2
Merge "Add NDK API for getprocnetwork"
2021-06-03 08:07: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
Remi NGUYEN VAN
8c05c9ec88
Merge fixed history of Connectivity
...
Bug: 189375701
Bug: 186628461
TEST: TH
Ignore-AOSP-First: per-branch merges
Merged-In: Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c
Change-Id: Id42a562cfaccc4bf0bae8a40635777841ed6d232
2021-06-03 10:43:01 +09:00
vichang
952eed1278
Merge "Use updated NetworkEventDispatcher API"
2021-06-02 17:00:58 +00:00
Chiachang Wang
02eea987c0
Merge changes I5d3e448e,Id69ac1d3
...
* changes:
Add test for ConnectivityManager.factoryReset
Correct the logic for CtsTetheringUtils.isWifiTetheringSupported
2021-06-02 01:24:10 +00:00
Treehugger Robot
c4d26414f8
Merge "Test tethered callback with TetheringInterface"
2021-06-01 14:35:48 +00:00
Treehugger Robot
414edc4ac9
Merge "Add the tethering type to TetheringEventCallback methods"
2021-06-01 14:33:51 +00:00
Aaron Huang
87f051bfa6
Merge "Add required permission to Tethering"
2021-06-01 10:13:34 +00:00
Remi NGUYEN VAN
a5e1148a4b
Add NDK API for getprocnetwork
...
The API is the getter couterpart for setprocnetwork.
Use it in NetworkUtils so that the NDK API can be the source of truth
for the process network.
Original change (project moved):
Ie8f68cf1fa57deddb63324c1abf3d6fd5b0ef500
Bug: 171540887
Test: atest CtsNetTestCases
Tests in change I311b58585033c2ca50ce5477ea9cd94b6f127507
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Iaf255f4aa29fd2ae02770baea5548ee8d5d407f2
2021-06-01 18:38:53 +09:00
Aaron Huang
b3d01d2c1d
Merge "Remove framework-connectivity-annotations library" into sc-dev am: 059ddb4025 am: 4a3eb4e02c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731888
Change-Id: I078cfb1f3bf500f90bc73b1f440e9fe9bc7e05d8
2021-06-01 08:49:37 +00:00
TreeHugger Robot
f96011db0f
Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev am: 98c351f429 am: 585c1b72d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14452540
Change-Id: If343a053e102a1b87bafa500560a02df2ee15615
2021-06-01 08:24:56 +00: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
Chiachang Wang
6391e22faf
Add test for ConnectivityManager.factoryReset
...
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk on R and S device
Change-Id: I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7
2021-06-01 15:09:06 +08:00
Chiachang Wang
4f5c4c4323
Correct the logic for CtsTetheringUtils.isWifiTetheringSupported
...
The existing isWifiTetheringSupported only check if tethering side
supports wifi tethering or not but not wifi side. A expected
behavior should include both of them, so add the wifi side check
into the helper function. Also update in the existing caller side
due to a new parameter added.
Bug: 186061922
Test: atest MtsTetheringTestLatestSdk
Change-Id: Id69ac1d30ab2bbf23e870193335b139f54672636
2021-06-01 15:08:48 +08: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
markchien
3a23d2e2a6
Test tethered callback with TetheringInterface
...
The old callback only report interface list, new callback could provide
the mapping of interface and type. Replace old callback usage in cts
with new callback and check whether old callback could get the correct
interface list by comparing the result between old and new callback.
Bug: 162920185
Bug: 152203943
Test: atest CtsTetheringTest on S
atest CtsTetheringTestLatestSdk on R
atest MtsTetheringTestLatestSdk on S and R
Merged-In: I2a0b8c43fb340c3eaed7f0f90464199222a24280
Change-Id: I2a0b8c43fb340c3eaed7f0f90464199222a24280
2021-06-01 14:36:09 +08:00