Commit graph android_packages_modules_Co.../core/java
Message SHA1
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
Merged-In: I97015365604be1846e3ecbaf60ac99e334705565

Chiachang Wang   commited 2020-03-18 05:44:26 +00:00
30a0107d13
Merge "Add Intdef annotation for eventId in logEvent" am: 91b05f7f58 am: fc7a1308cd am: 82ec7bcf4e
Change-Id: I7caa207fb35e8088e50de0651a72a6d9628e7ce2

Automerger Merge Worker   commited 2020-02-13 11:24:43 +00:00
23f68f81e0
Merge "Add Intdef annotation for eventId in logEvent" am: 91b05f7f58
Change-Id: Ic9b5ea605164340d5c2461eb7a1a752bb5b36bad

Automerger Merge Worker   commited 2020-02-13 10:56:35 +00:00
fc7a1308cd
Merge "Add Intdef annotation for eventId in logEvent"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-02-13 10:44:57 +00:00
91b05f7f58
Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: ba3cedd7f1
Change-Id: I2f9de2582025c8fc3782870b8c561ce2002abaf8

Automerger Merge Worker   commited 2020-02-13 06:54:50 +00:00
4d22d8279f
Merge "Add permission check for CaptivePortal#reevaluateNetwork"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-02-13 06:41:53 +00:00
ba3cedd7f1
Add Intdef annotation for eventId in logEvent
Follow API guide.

Bug: 148379628
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api

Change-Id: I410ef06b2fa82d8ef35513086733b0fc2cf0fe06

Chiachang Wang   commited 2020-02-13 06:26:35 +00:00
f326690d6f
Merge "Add permission check for CaptivePortal#reevaluateNetwork"
Chiachang Wang   authored and   Android (Google) Code Review   commited 2020-02-13 06:25:32 +00:00
b195328782
Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 32e18bea08
Change-Id: I00dd341f699d2a22cc3d190b43314a49bee9062a

Automerger Merge Worker   commited 2020-02-12 23:55:00 +00:00
e04b0f689b
Merge "Revert "NetworkRequest: Embed requestor uid & packageName""
Roshan Pius   authored and   Gerrit Code Review   commited 2020-02-12 23:36:13 +00:00
32e18bea08
Revert "NetworkRequest: Embed requestor uid & packageName"
This reverts commit 31f7152793.

Reason for revert: b/149425896
Bug: b/149425896

Change-Id: I9fe31509c040cc421ccb00ea60f15e6f199e8bc6

Roshan Pius   commited 2020-02-12 23:33:43 +00:00
fb61a94a88
Merge "NetworkRequest: Embed requestor uid & packageName" am: 0964d02bcd
Change-Id: Ic4f9247e18a9d1cc22b26500b47da1af2d9b011d

Automerger Merge Worker   commited 2020-02-12 18:51:59 +00:00
8ddf2cd025
Merge "NetworkRequest: Embed requestor uid & packageName"
Qingxi Li   authored and   Gerrit Code Review   commited 2020-02-12 18:43:32 +00:00
0964d02bcd
Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." am: 3dbf6f6949 am: ec0a4b6791 am: 489b7adcf8
Change-Id: Iae8c37ceeae1616b2b0edc43248e72f3de082f20

Automerger Merge Worker   commited 2020-02-12 17:50:39 +00:00
2310c8b694
Merge "Include NetworkCapabilities and LinkProperties in DataStallReport."
am: 3dbf6f6949

Change-Id: If2157b0dd7d62560c77318b76e0d7d2a66c09644

Cody Kesting   authored and   android-build-merger   commited 2020-02-12 09:16:41 -08:00
ec0a4b6791
Merge "Include NetworkCapabilities and LinkProperties in DataStallReport."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-02-12 16:38:38 +00:00
3dbf6f6949
Add permission check for CaptivePortal#reevaluateNetwork
CaptivePortal#reevaluateNetwork is added as a system API which
requires a proper permission check.

Bug: 148379628
Test: Manually check with captive portal
Test: atest FrameworksNetTests
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api

Change-Id: I3f974339d5bd53a6f6ecb0842c02a8264dc3a5f9
Merged-In: I559d42089aeb09801d14c251c5165fca793c3cb3

Chiachang Wang   commited 2020-02-12 11:29:24 +00:00
1fa770dc9e
Add permission check for CaptivePortal#reevaluateNetwork
CaptivePortal#reevaluateNetwork is added as a system API which
requires a proper permission check.

Bug: 148379628
Test: Manually check with captive portal
Test: atest FrameworksNetTests
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api

Change-Id: I559d42089aeb09801d14c251c5165fca793c3cb3

Chiachang Wang   commited 2020-02-12 11:28:55 +00:00
845c63755c
Merge changes Ibc9b1965,I288ea32f am: 7fa63afe6d
Change-Id: I6eb675ddfa609dcc3031e916ce49959e42cf53f6

Automerger Merge Worker   commited 2020-02-12 06:25:49 +00:00
5177c42147
Add a systemapi constructor for NetworkAgent am: 1a8802b0e1
Change-Id: I3fa3ec32d3c580ba0b7f2d515e08d27dd6af5bcd

Automerger Merge Worker   commited 2020-02-12 06:25:42 +00:00
de6d7d5a25
Fix invalid usage of javadoc
CP from ag/10125651

Test: this change removes invalid usage
Change-Id: Ibc9b1965ec7aa545c0dae71d741c3802d3a9fa12
Merged-In: I35fc4a814238635fa95981649c27230dda319afa

Aaron Huang   authored and   Chalard Jean   commited 2020-02-12 06:10:10 +00:00
a29902b59b
NetworkRequest: Embed requestor uid & packageName
Add the requestorUid & requestorPackageName fields to
NetworkCapabilities. This is populated by CS when
a new network request is received.
These 2 requestor fields are also optionally used for network
matching. All of the regular app initiated requests will have the
requestor uid and package name set by connectivity service. Network
agents can optionally set the requestorUid and requestorPackageName
to restrict the network created only to the app that requested the network.

This will help removing the necessity for the various specifiers to embed
the uid & package name info in the specifier for network matching.

Note: NetworkSpecifier.assertValidFromUid() is deprecated & removed in
favor of setting the uid/package name on the agent to restrict the
network to a certain app (useful for wifi peer to peer API & wifi aware).

Bug: 144102365
Test: Verified that wifi network request related CTS verifier tests
pass.
Test: Device boots up and connects to wifi networks
Change-Id: I207c446108afdac7ee2c25e6bbcbc37c4e3f6529
Merged-In: I207c446108afdac7ee2c25e6bbcbc37c4e3f6529

Roshan Pius   authored and   Qingxi Li   commited 2020-02-12 04:42:58 +00:00
31f7152793
Include NetworkCapabilities and LinkProperties in DataStallReport.
DataStallReport is updated to include the NetworkCapabilities and Link
Properties for the Network being reported on. This provides a more
complete picture of the Network conditions when the suspected data stall
was detected.

Bug: 148966398
Test: atest FrameworksNetTests
Change-Id: I913cf18c348b9f688f9d2a3d25a71bc94eb8f000

Cody Kesting   commited 2020-02-11 08:50:59 -08:00
4a77307caa
Add a systemapi constructor for NetworkAgent
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
      make doc-comment-check-docs
Change-Id: I288ea32fac07a9a486e2ea451a2c9b098446a74c
Merged-In: I288ea32fac07a9a486e2ea451a2c9b098446a74c

Chalard Jean   authored and   Aaron Huang   commited 2020-02-11 16:26:10 +08:00
1a8802b0e1
Merge "Fix review comments on aosp/1213524"
Aaron Huang   authored and   Gerrit Code Review   commited 2020-02-11 03:33:08 +00:00
90d4f6d94e
Fix review comments on aosp/1213524
This is necessary to avoid subsequent conflicts.

Test: none needed
Change-Id: I6e2cd9188e0e4bd7c71c6c56635f192dce73f325
Merged-In: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee

Chalard Jean   authored and   Aaron Huang   commited 2020-02-10 08:28:04 +00:00
2e58250b89
Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: 5ee2390f0b am: 406345a19c am: 00afbce489
Change-Id: I0677a6a31defcb6412f132dcbbfd54f02c82baf7

Automerger Merge Worker   commited 2020-02-07 17:37:44 +00:00
29a294b0af
Merge "Fix typo in ConnectivityDiagnosticsManager constant."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-02-07 16:57:19 +00:00
5ee2390f0b
Merge "Use framework-tethering-stub instead of framework-tethering"
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-02-07 11:32:23 +00:00
9a77e64d44
Use framework-tethering-stub instead of framework-tethering
The non-updatable part of the platform now is built with
framework-tethering-stub, which is a stub library of
framework-tethering.

Bug: 147200698
Test: m
Change-Id: I97ef83f7f9b4c1376f373713036f5256318f1050

markchien   commited 2020-02-07 00:27:26 +08:00
9e04624f15
NetworkRequest: Embed requestor uid & packageName
Add the requestorUid & requestorPackageName fields to
NetworkCapabilities. This is populated by CS when
a new network request is received.
These 2 requestor fields are also optionally used for network
matching. All of the regular app initiated requests will have the
requestor uid and package name set by connectivity service. Network
agents can optionally set the requestorUid and requestorPackageName
to restrict the network created only to the app that requested the network.

This will help removing the necessity for the various specifiers to embed
the uid & package name info in the specifier for network matching.

Note: NetworkSpecifier.assertValidFromUid() is deprecated & removed in
favor of setting the uid/package name on the agent to restrict the
network to a certain app (useful for wifi peer to peer API & wifi aware).

Bug: 144102365
Test: Verified that wifi network request related CTS verifier tests
pass.
Test: Device boots up and connects to wifi networks
Change-Id: I207c446108afdac7ee2c25e6bbcbc37c4e3f6529

Roshan Pius   commited 2020-02-06 07:36:29 -08:00
d26ae41442
Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-02-05 19:55:05 +00:00
b68115afb8
Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras.
INetworkMonitorCallbacks defines notifyNetworkTestedWithExtras() for
notifying ConnectivityService of networks being tested along with a
PersistableBundle of extras. A new event is introduced for
NetworkStateTrackerHandler to notify the ConnectivityDiagnosticsHandler
before continuing with the normal processing for "network tested"
notifications. The event is also used in the
ConnectivityDiagnosticsHandler.

Bug: 143187964
Bug: 147391402
Test: compiles.
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: Iab29da790c0f5faae68227770bc3a84bbc94f124
Merged-In: Iab29da790c0f5faae68227770bc3a84bbc94f124

Cody Kesting   commited 2020-02-05 18:48:12 +00:00
d292a330c1
Fix typo in ConnectivityDiagnosticsManager constant.
This change fixes a typo in the value assigned to the constant
KEY_NETWORK_PROBES_ATTEMPTED_BITMASK, which is defined in
ConnectivityDiagnosticsManager.ConnectivityReport.

Bug: 148939502
Test: compiles
Change-Id: I63863efa8c69593012bf4e95d896db192c6bfb5c

Cody Kesting   commited 2020-02-05 08:56:48 -08:00
c52e5aa76e
Merge "Add separate user consent for Platform VPNs"
Benedict Wong   authored and   Gerrit Code Review   commited 2020-02-04 23:56:16 +00:00
53bc29df86
Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras.
INetworkMonitorCallbacks defines notifyNetworkTestedWithExtras() for
notifying ConnectivityService of networks being tested along with a
PersistableBundle of extras. A new event is introduced for
NetworkStateTrackerHandler to notify the ConnectivityDiagnosticsHandler
before continuing with the normal processing for "network tested"
notifications. The event is also used in the
ConnectivityDiagnosticsHandler.

Bug: 143187964
Bug: 147391402
Test: compiles.
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: Iab29da790c0f5faae68227770bc3a84bbc94f124
(cherry picked from commit c5326407d592490783259a48a8ca653c4ff13122)

Cody Kesting   commited 2020-02-04 13:55:08 -08:00
980971150f
Add separate user consent for Platform VPNs
This change adds a new VPN user consent flow (using the same text) for
granting the lesser OP_ACTIVATE_PLATFORM_VPN. A new
PlatformVpnConfirmDialog is created as a subclass to preserve all logic,
but ensure the right appop is granted for the relevant dialog.

Intent extras were considered, but are inherently unsafe, since the
caller may add any extras that they would want.

Bug: 144246835
Test: FrameworksNetTests passing
Change-Id: Ia6f36207d43c3748f938430c2780dcf29e5623f3
Merged-In: Ia6f36207d43c3748f938430c2780dcf29e5623f3

Benedict Wong   commited 2020-02-04 21:05:36 +00:00
6458ddff18
Add separate user consent for Platform VPNs
This change adds a new VPN user consent flow (using the same text) for
granting the lesser OP_ACTIVATE_PLATFORM_VPN. A new
PlatformVpnConfirmDialog is created as a subclass to preserve all logic,
but ensure the right appop is granted for the relevant dialog.

Intent extras were considered, but are inherently unsafe, since the
caller may add any extras that they would want.

Bug: 144246835
Test: FrameworksNetTests passing
Change-Id: Ia6f36207d43c3748f938430c2780dcf29e5623f3

Benedict Wong   commited 2020-02-03 19:05:23 -08:00
b3e30be7e4
Merge changes I446a8595,I68d2293f am: 0561b934dc am: 54e08a83e9 am: 436df92fee
Change-Id: I99a531ab5ed8645d3eb3d15a3cd4ed6ef30c89ab

Automerger Merge Worker   commited 2020-02-03 22:53:15 +00:00
515d47543a
Merge changes I446a8595,I68d2293f
* changes:
  Add VpnManager calls to ConnectivityService
  Add basic logic for profile-based VPNs

Benedict Wong   authored and   Gerrit Code Review   commited 2020-02-03 22:31:37 +00:00
0561b934dc
Merge "Update javadocs for ConnectivityDiagnosticsManager." am: 162a762c57 am: 968afd99fb am: 042566cf20
Change-Id: Icd75afae770c93ac6fdb611e220d8723c07771ac

Automerger Merge Worker   commited 2020-02-03 15:18:32 +00:00
c2832f2603
Merge "Add callback registration in ConnectivityService." am: 49c3b00b1a am: bbb915b13f am: e2422892c6
Change-Id: I596d4788f6d35f1adf110d8edd390f5632b4dc06

Automerger Merge Worker   commited 2020-02-03 15:18:18 +00:00
a672f64245
Merge "Update javadocs for ConnectivityDiagnosticsManager."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-02-03 14:56:13 +00:00
162a762c57
Merge "Add callback registration in ConnectivityService."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-02-03 14:55:54 +00:00
49c3b00b1a
Update javadocs for ConnectivityDiagnosticsManager.
ConnectivityDiagnosticsManager comments for
registerConnectivityDiagnosticsCallback and
unregisterConnectivityDiagnosticsCallback are updated to reflect several
changes.

For register calls, any app will be able to register callbacks, but only
permissioned applications will have their callbacks invoked (and only
for networks managed by the application). Additionally, only the
registering app (uid) will be able to unregister a callback once
registered.

Bug: 143187964
Test: docs change only. compiles.
Change-Id: Ie7ae86a1afccb22d6c84027dbac49d7b8e431e8c

Cody Kesting   commited 2020-01-31 09:49:25 -08:00
6d8560dcce
Add callback registration in ConnectivityService.
ConnectivityDiagnosticsManager will send callbacks to
ConnectivityService for registering and unregistering them with the
system. ConnectivityService needs to do the processing for persisting
(and deleting) these callbacks on the ConnectivityService Thread, so
messages are sent to the Connectivity Diagnostics  Handler, which runs
on the ConnectivityService Thread.

Bug: 146444622
Bug: 143187964
Bug: 147848028
Test: compiles
Test: atest FrameworksNetTests
Change-Id: Ia5c8f90a60c050504e8676de9564a7607a9b03bc

Cody Kesting   commited 2020-01-31 09:42:05 -08:00
0ffbf92e0c
Merge "Add public fields to NetworkScore and make it @SystemApi"
Chalard Jean   authored and   Android (Google) Code Review   commited 2020-01-31 03:06:16 +00:00
5f8f467f44
Add basic logic for profile-based VPNs
This change adds stubs for the Platform built-in VPNs, along with
implementing some basic permissions checks.

Bug: 144246837
Test: FrameworksNetTests passing, new tests added
Change-Id: I68d2293fc1468544f0d9f64d02ea7e1c80c8d18c

Benedict Wong   commited 2020-01-30 18:41:12 -08:00
419a6f06f9
Add public fields to NetworkScore and make it @SystemApi
Bug: 113554781
Bug: 146583853
Test: FrameworksNetTests
Change-Id: I19d965c0146196cb67b3417eb1790ccd90ce3233

Chalard Jean   commited 2020-01-30 18:45:52 +09:00
a9727279ae
NetworkAgent: Fix doc build fail by invalid tag
Bug: 138306002
Bug: 139268426
Test: make doc-comment-check-docs

Change-Id: I8b8df5096b90ad10545087ab09f68ecae637aa35
Merged-In: I8b8df5096b90ad10545087ab09f68ecae637aa35

markchien   authored and   Lorenzo Colitti   commited 2020-01-30 03:37:45 +00:00
f4906c8a8c