Commit graph android_packages_modules_Co.../core/java
Message SHA1
Merge changes I97015365,Ic9db4b9b am: d080a4a32d am: 1c25e4ff44
Change-Id: I058fcb4d7dac3ef384c3ccbe5a2cc880c6aed2a3

Automerger Merge Worker   commited 2020-03-17 10:16:15 +00:00
ba33556f86
Merge changes I97015365,Ic9db4b9b
* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest

Chiachang Wang   authored and   Gerrit Code Review   commited 2020-03-17 09:38:41 +00:00
d080a4a32d
Merge "services.net: Add a static library needed by wifi module"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-03-17 09:22:12 +00:00
a0f5e8f3c2
Merge "Move sensitive field parceling bool to constructor" am: 9e2a0cb322 am: 82280b8bb9
Change-Id: Ice332671a4b97dad595c79c8c42ce47dca52b8e2

Automerger Merge Worker   commited 2020-03-17 08:17:51 +00:00
91a66f29ac
Add NattKeepalivePacketDataTest
Add test for constructor and parcel

Test: atest CtsNetTestCasesLatestSdk:android.net.NattKeepalivePacketDataTest
      on both Q and R devices
Bug: 151402211
Change-Id: I97015365604be1846e3ecbaf60ac99e334705565

Chiachang Wang   commited 2020-03-17 15:48:02 +08:00
fd007f01ef
Move sensitive field parceling bool to constructor
This addresses API review comments recommending to use a copy
constructor with additional parameters instead of a dedicated method.
makeSensitiveFieldsParcelingCopy becomes LinkProperties(base, true).

Bug: 150877475
Test: atest FrameworksNetTests NetworkStackTests NetworkStackNextTests
Change-Id: Ib145ca7f36dcbee6ef47d09862a181fc04a28f03

Remi NGUYEN VAN   commited 2020-03-17 11:42:33 +09:00
c38954692a
Merge "Add support for registering test networks with administrators." am: ed4de26836 am: 6fbb503d34
Change-Id: Ib10e5f0e1b564a4dd8e5ae0bd4032741dcd4e2bb

Automerger Merge Worker   commited 2020-03-16 18:32:43 +00:00
c865f84b76
Merge "Add support for registering test networks with administrators."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-16 18:02:55 +00:00
ed4de26836
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21
Change-Id: I72f00d09e74eb0de1d837a29a2b869a4de45178d

Automerger Merge Worker   commited 2020-03-16 05:53:15 +00:00
86fbb8231c
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev
Aaron Huang   authored and   Android (Google) Code Review   commited 2020-03-16 05:47:34 +00:00
eb93e7de21
services.net: Add a static library needed by wifi module
Add a new static library that compiles against system_current which
includes all the parts needed by the wifi mainline module.

Also,
a) Refactored TcpKeepalivePacketData to use public APIs. The parcel
read/write methods in the base class are @hide and they're not used by
the other child class (NatKeepalivePacketData). So, remove the @hide
method from base class and use it direcly in the child class.

Bug: 145825329
Test: Device boots up & connects to wifi networks.
Change-Id: Ifde69b579cfe5b813766f676acb10e436e64a44c
Merged-In: Ifde69b579cfe5b813766f676acb10e436e64a44c

Roshan Pius   commited 2020-03-16 00:23:42 +00:00
9c259cd90a
Merge "Add javadoc for Network#netId" into rvc-dev
Mark Chien   authored and   Android (Google) Code Review   commited 2020-03-15 02:53:29 +00:00
239acdbbb1
Merge changes from topic "services.net-wifi" into rvc-dev am: 79a252687d
Change-Id: I16a2b101e0d613fcd0d194b42ffb599865632ba9

Automerger Merge Worker   commited 2020-03-13 22:54:14 +00:00
239cd04817
Merge "Update Javadoc comments for ConnectivityDiagnostics constants." am: 082ec1d459 am: 5afb008614
Change-Id: I915de84881b04695b63769b270e6bddaeeceb1da

Automerger Merge Worker   commited 2020-03-13 19:49:45 +00:00
249a33427f
Merge "Update Javadoc comments for ConnectivityDiagnostics constants."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-13 19:09:18 +00:00
082ec1d459
services.net: Add a static library needed by wifi module
Add a new static library that compiles against system_current which
includes all the parts needed by the wifi mainline module.

Also,
a) Refactored TcpKeepalivePacketData to use public APIs. The parcel
read/write methods in the base class are @hide and they're not used by
the other child class (NatKeepalivePacketData). So, remove the @hide
method from base class and use it direcly in the child class.
b) Add jar-jar rules for all the statically linked dependencies in wifi
service jar rules.

Exempt-From-Owner-Approval: Minor change on top of owner's approval.
Bug: 145825329
Test: Device boots up & connects to wifi networks.
Change-Id: Ifde69b579cfe5b813766f676acb10e436e64a44c

Roshan Pius   commited 2020-03-13 14:42:09 +00:00
7cf9cb25e3
Removing some of the API don't have to be @SystemApi
Some of the API we made @SystemApi won't be used by mainline
module. Removing these from the surface.

Bug: 151266974
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      atest FrameworksWifiTests

Change-Id: Ie30efa172f93a7557fb6ef56f4daf80e958c3787

Aaron Huang   commited 2020-03-13 15:08:05 +08:00
e93348f00d
Add javadoc for Network#netId
Bug: 151156820
Test: m doc-comment-check-docs

Change-Id: I18e6022c7b0b8bf132069f33d916d1b16d53d4f0
Merged-In: Iea34a5c58a8b77c83258a39a8a44601e21a482f5
(cherry picked from commit ab23c0fef8c02a9d63b1b48628eb687f589aac72)

Automerger Merge Worker   authored and   Mark Chien   commited 2020-03-13 02:31:30 +00:00
5b4b6d710d
Merge "Add javadoc for Network#netId" am: 12e8b300b0 am: c1fb643492
Change-Id: Ifcd5050d5d3499fece7fb359a6a4753333005e68

Automerger Merge Worker   commited 2020-03-12 10:30:05 +00:00
6259702dca
Merge "Add javadoc for Network#netId"
Mark Chien   authored and   Gerrit Code Review   commited 2020-03-12 09:55:18 +00:00
12e8b300b0
Add javadoc for Network#netId
Bug: 151156820
Test: m doc-comment-check-docs
Change-Id: Iea34a5c58a8b77c83258a39a8a44601e21a482f5

markchien   authored and   Mark Chien   commited 2020-03-12 09:54:44 +00:00
6c65c01b1a
Add support for registering test networks with administrators.
CTS testing for ConnectivityDiagnosticsManager requires registering
TestNetworks with the administrator UIDs set. This sets up the CTS
process to be an administrator over the test network, which allows it to
receive ConnectivityDiagnosticsCallback callbacks.

Bug: 148032944
Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest
Test: atest IpSecManagerTunnelTest
Change-Id: I7a443c368cf1ac470fbe40883ca24bc3143153b0

Cody Kesting   commited 2020-03-10 23:27:01 -07:00
c5941bb7a3
Remove framework code that has moved to frameworks/libs/net
Add srcs to framework and change import path.
Remove the codes which are moved to frameworks/libs/net.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ia5692aade490fbc8a037186fcdfc453e0dd8045b
Merged-In: Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c

Aaron Huang   commited 2020-03-10 06:45:16 +00:00
2a21ea79ab
Remove polling of TetheringManager in ConnectivityManager.
Test: manual

Bug: 144742179
Merged-In: I7d88b38eb3d741534e980b7d1e226a411b71fae2
(cherry picked from commit f8a55a19faa938b4e58310f9a90926276b7936ea)

Change-Id: I5cc4231bfb9a0709d677acbb317ee98af31bd041

Automerger Merge Worker   authored and   Remi NGUYEN VAN   commited 2020-03-09 06:29:22 +00:00
9b0c0c61d3
Remove the NetworkScore class.
This class is useless at this point and introduces overhead.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ib5f540070222865260c16c7182cc13c710a243c2
Merged-In: Ib5f540070222865260c16c7182cc13c710a243c2
(cherry picked from commit c3489ad3a6ce98218ce223cea877586781025b98)

Automerger Merge Worker   authored and   Chalard Jean   commited 2020-03-09 03:46:34 +00:00
213bc8277e
Merge "Remove the NetworkScore class." am: b9378258ff am: 68ae9e8944
Change-Id: I5a14c3488b1f7011d49134819f659e3864b85f16

Automerger Merge Worker   commited 2020-03-08 05:26:15 +00:00
b2172740d6
Merge "Remove the NetworkScore class." am: b9378258ff
Change-Id: Ieb78467dac3aca48eea9d049b83a74f9ff41eec7

Automerger Merge Worker   commited 2020-03-08 05:11:03 +00:00
68ae9e8944
Merge "Remove the NetworkScore class."
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-03-08 04:52:26 +00:00
b9378258ff
Update Javadoc comments for ConnectivityDiagnostics constants.
API Council feedback requested adding documentation for detection method
constants used in DataStallReport to indicate how the Data Stall was
detected.

Bug: 150598997
Test: n/a
Change-Id: Ib08f05562dd4b17973eeee97452d9f56d37e80fe

Cody Kesting   commited 2020-03-06 08:05:06 -08:00
950f4effa6
Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master
Aaron Huang   authored and   Android (Google) Code Review   commited 2020-03-06 05:53:20 +00:00
1f4bfd624c
Remove the NetworkScore class.
This class is useless at this point and introduces overhead.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ib6da6c1c7f2a0b97c847d2e64e5ce16dd821e1e7

Chalard Jean   commited 2020-03-06 11:57:53 +09:00
de41981736
Merge "Remove polling of TetheringManager in ConnectivityManager." am: ca0b6c5205 am: c1314bb84f
Change-Id: I7d88b38eb3d741534e980b7d1e226a411b71fae2

Automerger Merge Worker   commited 2020-03-06 00:38:43 +00:00
c24aad5d63
Merge "Remove polling of TetheringManager in ConnectivityManager."
Amos Bianchi   authored and   Gerrit Code Review   commited 2020-03-05 18:34:59 +00:00
ca0b6c5205
Remove polling of TetheringManager in ConnectivityManager.
Test: manual

Bug: 144742179

Change-Id: I196b320788be96c120f771d2fcdf032a73e26b5f

Amos Bianchi   commited 2020-03-05 18:34:14 +00:00
ddadca41a9
Remove framework code that has moved to frameworks/libs/net
Add srcs to framework and change import path.
Remove the codes which are moved to frameworks/libs/net.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I44e0a8361637c2d43be2e5d033d405b22e1a149c
Merged-In: I067cdc404e5a63947c19cb75069a39ae42faa3c8
Merged-In: Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef

Aaron Huang   commited 2020-03-05 13:53:39 +08:00
d2db22ddaf
Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 2fb2b2614c am: 1ce46dd2cb
Change-Id: Ifb0b5b9742a9a4c0c4c1845c647184d65cff8e4f

Automerger Merge Worker   commited 2020-03-04 10:50:48 +00:00
de04ad6459
Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 2fb2b2614c
Change-Id: I1ab6d47c17992f8630d9aba892bcef29dcb66bfa

Automerger Merge Worker   commited 2020-03-04 10:32:09 +00:00
1ce46dd2cb
Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider"
Paul Hu   authored and   Gerrit Code Review   commited 2020-03-04 10:15:41 +00:00
2fb2b2614c
Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider
Registering/Unregistering network provider needs NETWORK_FACTORY
which is signature only permission. But mainline modules can't
grant this permission because it's not signed with platform key.
Hence, these APIs should also accept MAINLINE_NETWORK_STACK
permission that allow mainline module to register/unregister
network provider.

Bug: 150733435
Test: atest FrameworksNetTests
Change-Id: Id22113aa0db01244817b4b008f5573c5e7b317f0

paulhu   commited 2020-03-04 09:43:41 +08:00
4493983bbd
Merge "Update NetworkInfo public API." am: a6a1df873b
Change-Id: I6658d79bd9bda22ed6b8acac90ba94c9ef18c488

Automerger Merge Worker   commited 2020-03-03 09:40:07 +00:00
2211fb37f8
Merge "Update NetworkInfo public API."
Aaron Huang   authored and   Gerrit Code Review   commited 2020-03-03 09:16:55 +00:00
a6a1df873b
New NetworkAgentConfig API to replace NetworkInfo WiFi stuff. am: 5915b47708
Change-Id: I94e3b25aa202e75338115f82c6db0dd0e41deb48

Automerger Merge Worker   commited 2020-03-03 03:53:58 +00:00
30234357de
Merge "Move NetworkAgent#register to a new method." am: 6b685976fc
Change-Id: I4ca48f4232ad4733da5ce7f265fc911f5ff1a713

Automerger Merge Worker   commited 2020-03-03 03:52:17 +00:00
bd020ca7ac
Merge changes from topic "del-factory-and-networkagent-wifi"
* changes:
  Delete NetworkFactory from frameworks/base/core.
  New NetworkAgentConfig API to replace NetworkInfo WiFi stuff.

Aaron Huang   authored and   Gerrit Code Review   commited 2020-03-03 03:47:31 +00:00
928a3a7216
Merge "Move NetworkAgent#register to a new method."
Aaron Huang   authored and   Gerrit Code Review   commited 2020-03-03 03:37:07 +00:00
6b685976fc
Merge "Remove framework code that has moved to frameworks/libs/net"
Aaron Huang   authored and   Gerrit Code Review   commited 2020-03-02 06:23:44 +00:00
00b5ec5d3d
Merge "Always set NetworkInfo objects to available." am: 335ed0793b
Change-Id: I89b53d1a254ca43566286b1309ce88b8a1518c4a

Automerger Merge Worker   commited 2020-03-02 05:10:35 +00:00
418242683e
Merge "Always set NetworkInfo objects to available."
Aaron Huang   authored and   Gerrit Code Review   commited 2020-03-02 04:53:10 +00:00
335ed0793b
Revert "Add public fields to NetworkScore and make it @SystemApi"
This reverts commit a9727279ae.

Bug: 113554781
Test: FrameworksNetTests FrameworksTelephonyTests FrameworksWifiTests
Change-Id: Ie1e84bd2a16f088307b195f924f4e49335cbe367

Chalard Jean   commited 2020-02-28 06:26:27 +00:00
fe4abf9977
Merge "Add methods to send connected/disconnected state." am: 8680ec1193
Change-Id: If69bd650e129dc9f058e47832d48651b9243a3bb

Automerger Merge Worker   commited 2020-02-27 03:23:48 +00:00
34eb702c57