Commit Graph

8417 Commits

Author SHA1 Message Date
Automerger Merge Worker
23e4a45d1f Merge "[NS A43] Separate updating the linger timer and sending LOSING" am: 10c32e38a2 am: 42a3342ed7 am: 8a7b232080
Change-Id: Ia51cd7174e24744c8b2d3566f9e7b12f47504564
2020-02-09 07:34:46 +00:00
Automerger Merge Worker
f97b8c5f40 Merge "[NS A42] Move writing to the reassignment to the computation" am: 113d552eff am: f0c7699e38 am: 5fff418068
Change-Id: If7fc3f8d859cfa7ba0bb7d638dbe5cae741cae71
2020-02-09 07:34:27 +00:00
Automerger Merge Worker
8a7b232080 Merge "[NS A43] Separate updating the linger timer and sending LOSING" am: 10c32e38a2 am: 42a3342ed7
Change-Id: Id7ed8f80307d2e1252195a6aef62e51d0c4e7f27
2020-02-09 07:21:19 +00:00
Automerger Merge Worker
5fff418068 Merge "[NS A42] Move writing to the reassignment to the computation" am: 113d552eff am: f0c7699e38
Change-Id: Iebe3dbd3b98f4b92486e86c48b0e50b6713b2aa6
2020-02-09 07:20:57 +00:00
Automerger Merge Worker
42a3342ed7 Merge "[NS A43] Separate updating the linger timer and sending LOSING" am: 10c32e38a2
Change-Id: I4b8e7eec2df77d04700582542d6f3f2fb455c2af
2020-02-09 07:06:13 +00:00
Automerger Merge Worker
f0c7699e38 Merge "[NS A42] Move writing to the reassignment to the computation" am: 113d552eff
Change-Id: Ic04c72d0720bb53a38329dbcbc75cd914e1296c0
2020-02-09 07:05:54 +00:00
Chalard Jean
10c32e38a2 Merge "[NS A43] Separate updating the linger timer and sending LOSING" 2020-02-09 06:51:06 +00:00
Chalard Jean
113d552eff Merge "[NS A42] Move writing to the reassignment to the computation" 2020-02-09 06:50:48 +00:00
Automerger Merge Worker
1c65bc8d13 Merge "[NS A41] Cut out a function to update NAI info" am: 956532eb3e am: ffc43638ef am: fab9832dc7
Change-Id: Ie40f6e1428a7d3a98bb2b83bb6ac9f9224aa3de7
2020-02-09 05:45:49 +00:00
Automerger Merge Worker
fab9832dc7 Merge "[NS A41] Cut out a function to update NAI info" am: 956532eb3e am: ffc43638ef
Change-Id: If22b44893c33c3640a85eed7e6dc0ce888018059
2020-02-09 05:33:29 +00:00
Automerger Merge Worker
ffc43638ef Merge "[NS A41] Cut out a function to update NAI info" am: 956532eb3e
Change-Id: I668fe3095ee9184b50db83d8f52f572dc57cfa1f
2020-02-09 05:09:07 +00:00
Chalard Jean
956532eb3e Merge "[NS A41] Cut out a function to update NAI info" 2020-02-09 04:56:37 +00:00
Automerger Merge Worker
29a294b0af Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: 5ee2390f0b am: 406345a19c am: 00afbce489
Change-Id: I0677a6a31defcb6412f132dcbbfd54f02c82baf7
2020-02-07 17:37:44 +00:00
Automerger Merge Worker
00afbce489 Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: 5ee2390f0b am: 406345a19c
Change-Id: Iab752a848a8017fbfdc4517502d5a39d8201a682
2020-02-07 17:22:37 +00:00
Automerger Merge Worker
406345a19c Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: 5ee2390f0b
Change-Id: Icaae03ca1895de4012deed1c1b81b16fad4ba439
2020-02-07 17:08:20 +00:00
Cody Kesting
5ee2390f0b Merge "Fix typo in ConnectivityDiagnosticsManager constant." 2020-02-07 16:57:19 +00:00
TreeHugger Robot
9a77e64d44 Merge "Use framework-tethering-stub instead of framework-tethering" 2020-02-07 11:32:23 +00:00
Roshan Pius
f125f9a8e7 Merge changes from topic "network_specifier_uid_packageName"
* changes:
  Wifi/WifiAware NetworkSpecifier: Stop storing uid/packageName
  NetworkRequest: Embed requestor uid & packageName
2020-02-06 19:08:51 +00:00
Automerger Merge Worker
af8f19e364 Merge "Use waitForIdle() to wait for Threaded processing." am: a67124b1af am: cfa95efc78 am: 3fd040a4f2
Change-Id: I0d7cbe58f55e25e552f6ae17ffd19cb79f86fe45
2020-02-06 16:38:11 +00:00
Automerger Merge Worker
a9342e09c3 [automerger skipped] Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." am: bd021eb75e am: e42c0bbb01 am: 8d58f46d52 -s ours
am skip reason: Change-Id Icc6bcf7a2411133d8ecd7477bc351dad9333f24f with SHA-1 b8effbdfb8 is in history

Change-Id: If371a1a419404433930dbc732d4c84037b6fa0d5
2020-02-06 16:37:18 +00:00
Automerger Merge Worker
6d1cda9009 [automerger skipped] Merge "Implement INetworkMonitorCallbacks#notifyDataStallSuspected." am: d0045a1064 am: 08850cb3fb am: e183639edf -s ours
am skip reason: Change-Id I70320bdda9855dced31e08e6a0b25329fb5cb535 with SHA-1 4d8ecafb5e is in history

Change-Id: I2f2eef92341a4341a7fb8a20c32aec3c11e2d442
2020-02-06 16:37:01 +00:00
markchien
9e04624f15 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
2020-02-07 00:27:26 +08:00
Automerger Merge Worker
3fd040a4f2 Merge "Use waitForIdle() to wait for Threaded processing." am: a67124b1af am: cfa95efc78
Change-Id: I1d648dd7d700230afab893336ef853a41717ba80
2020-02-06 16:23:10 +00:00
Automerger Merge Worker
8d58f46d52 Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." am: bd021eb75e am: e42c0bbb01
Change-Id: I44d75efacebae77914eda6da7efaaf11676e71fc
2020-02-06 16:22:50 +00:00
Automerger Merge Worker
e183639edf Merge "Implement INetworkMonitorCallbacks#notifyDataStallSuspected." am: d0045a1064 am: 08850cb3fb
Change-Id: Iebcb87445b9bb7b36052c62160b4069b76432a18
2020-02-06 16:21:44 +00:00
Automerger Merge Worker
cfa95efc78 Merge "Use waitForIdle() to wait for Threaded processing." am: a67124b1af
Change-Id: Ida71ad5d045f87dd11877dc93d42885333bba336
2020-02-06 16:10:28 +00:00
Automerger Merge Worker
e42c0bbb01 Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." am: bd021eb75e
Change-Id: I60d418afb145238981c17cc9a29ff57dc42c1ff0
2020-02-06 16:10:05 +00:00
Automerger Merge Worker
08850cb3fb Merge "Implement INetworkMonitorCallbacks#notifyDataStallSuspected." am: d0045a1064
Change-Id: I20aab2e77056df67df5bf9e9d6bd1888cf17a558
2020-02-06 16:08:33 +00:00
Cody Kesting
a67124b1af Merge "Use waitForIdle() to wait for Threaded processing." 2020-02-06 15:54:53 +00:00
Cody Kesting
bd021eb75e Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." 2020-02-06 15:54:06 +00:00
Cody Kesting
d0045a1064 Merge "Implement INetworkMonitorCallbacks#notifyDataStallSuspected." 2020-02-06 15:47:26 +00:00
Roshan Pius
d26ae41442 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
2020-02-06 07:36:29 -08:00
Chalard Jean
d915e36582 [NS A43] Separate updating the linger timer and sending LOSING
This will be necessary because updating the linger timer is
what lets the network agent know whether the network is

Test: ConnectivityServiceTest
Change-Id: I9b5a36f6d5eac5a404eff6740cd8f4dcbb0c2786
2020-02-06 18:04:13 +09:00
Chalard Jean
81a757ef4e [NS A42] Move writing to the reassignment to the computation
...instead of the side effect loop. This is a no-op refactoring.

Test: ConnectivityServiceTest
Change-Id: I8308d55eaff080efb22a7a43142492545e626cf5
2020-02-06 18:04:09 +09:00
Chalard Jean
f57b969d66 [NS A41] Cut out a function to update NAI info
Test: ConnectivityServiceTest
Change-Id: I6d92fb1699eb0acb1bcd7baa4a5d9d3e1c0dc728
2020-02-06 18:03:30 +09:00
Automerger Merge Worker
970f9f6609 Merge "[NS A40] Read current reassignment state instead of global state" am: 9af866f454 am: ee850dc0c2 am: a43b0b1379
Change-Id: Ib34a50288317259cb3e3f7d631dff614485129a5
2020-02-06 04:42:10 +00:00
Automerger Merge Worker
a43b0b1379 Merge "[NS A40] Read current reassignment state instead of global state" am: 9af866f454 am: ee850dc0c2
Change-Id: I897076fedc74a810e4eaeb530c496219e26ebbf1
2020-02-06 04:26:56 +00:00
Automerger Merge Worker
ee850dc0c2 Merge "[NS A40] Read current reassignment state instead of global state" am: 9af866f454
Change-Id: I12ca40b29588c651c77d272bcde87fdbe8037f60
2020-02-06 04:23:11 +00:00
Chalard Jean
9af866f454 Merge "[NS A40] Read current reassignment state instead of global state" 2020-02-06 04:14:43 +00:00
Cody Kesting
1bae54ccb1 Use waitForIdle() to wait for Threaded processing.
Unit testing for ConnectivityDiagnostics API in ConnectivityServiceTest
is updated to use HandlerUtilsKt#waitForIdle. In the general case, this
takes the same time to run as verify-with-timeout (used previously).
However, test failures due to messages not being enqueued on the handler
(backed by the ConnectivityService Thread) won't incur the timeout
delay, as the thread will be idle sooner. This shortens the delay in the
event of a programming error.

Bug: 143187964
Test: atest FrameworksNetTests
Change-Id: Iae66309501bb83449ca735dfa5e972a9852cbcd0
2020-02-05 15:05:29 -08:00
Cody Kesting
a58c07c71e Fire ConnectivityDiagnostics callbacks on Connectivity reported.
When ConnectivityService#reportNetworkTested is called, the platform
needs to fire ConnectivityDiagnostics callbacks for registered callbacks
that are permissioned for the network being reported on. This adds a new
event to ConnectivityDiagnosticsHandler for invoking these callbacks.

Bug: 143187964
Test: compiles
Test: atest CtsNetTestCases ConnectivityServiceTest
Change-Id: Icc6bcf7a2411133d8ecd7477bc351dad9333f24f
Merged-In: Icc6bcf7a2411133d8ecd7477bc351dad9333f24f
2020-02-05 15:05:29 -08:00
Cody Kesting
1d326387e4 Implement INetworkMonitorCallbacks#notifyDataStallSuspected.
INetworkMonitorCallbacks defines notifyDataStallSuspected() for
notifying ConnectivityService of networks encountering a potential data
stall. A new event is introduced for ConnectivityDiagnosticsHandler to
process the notification and invoke the relevant
ConnectivityDiagnosticsCallbacks.

Bug: 143187964
Test: compiles
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I70320bdda9855dced31e08e6a0b25329fb5cb535
Merged-In: I70320bdda9855dced31e08e6a0b25329fb5cb535
2020-02-05 15:05:28 -08:00
Automerger Merge Worker
c56b597b5a [automerger skipped] Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." am: b68115afb8 am: dcc253f9a5 am: 36922216ad -s ours
am skip reason: Change-Id Iab29da790c0f5faae68227770bc3a84bbc94f124 with SHA-1 980971150f is in history

Change-Id: Id9bb3a105949c34234f9f8f5ae1043e5d70613a5
2020-02-05 20:35:29 +00:00
Automerger Merge Worker
36922216ad Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." am: b68115afb8 am: dcc253f9a5
Change-Id: I3b32a91106646e98cf52b4ca48eeb4ebacd164db
2020-02-05 20:23:52 +00:00
Automerger Merge Worker
dcc253f9a5 Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." am: b68115afb8
Change-Id: I39b74228c6c2a48ace7ad36dba995fa6f91bfbb5
2020-02-05 20:09:32 +00:00
Cody Kesting
b68115afb8 Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." 2020-02-05 19:55:05 +00:00
Cody Kesting
d292a330c1 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
2020-02-05 18:48:12 +00:00
Cody Kesting
c52e5aa76e 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
2020-02-05 08:56:48 -08:00
Cody Kesting
b8effbdfb8 Fire ConnectivityDiagnostics callbacks on Connectivity reported.
When ConnectivityService#reportNetworkTested is called, the platform
needs to fire ConnectivityDiagnostics callbacks for registered callbacks
that are permissioned for the network being reported on. This adds a new
event to ConnectivityDiagnosticsHandler for invoking these callbacks.

Bug: 143187964
Test: compiles
Test: atest CtsNetTestCases ConnectivityServiceTest
Change-Id: Icc6bcf7a2411133d8ecd7477bc351dad9333f24f
(cherry picked from commit 3d57b0f4ff5b56780c79df6062dfaf2b9fa5ae3c)
2020-02-05 07:10:47 -08:00
Cody Kesting
4d8ecafb5e Implement INetworkMonitorCallbacks#notifyDataStallSuspected.
INetworkMonitorCallbacks defines notifyDataStallSuspected() for
notifying ConnectivityService of networks encountering a potential data
stall. A new event is introduced for ConnectivityDiagnosticsHandler to
process the notification and invoke the relevant
ConnectivityDiagnosticsCallbacks.

Bug: 143187964
Test: compiles
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I70320bdda9855dced31e08e6a0b25329fb5cb535
(cherry picked from commit 6c51dc9de39d7963a6bc6d03eacadf2ba2131e20)
2020-02-05 07:10:47 -08:00