Commit Graph

7937 Commits

Author SHA1 Message Date
Automerger Merge Worker
b79e7f919c Add a systemapi constructor for NetworkAgent am: 0900154ef5 am: 1021194560
Change-Id: I091a6c7d8e92c22ca9393b5c974fcda5356d4102
2020-02-12 06:35:39 +00:00
Automerger Merge Worker
1021194560 Add a systemapi constructor for NetworkAgent am: 0900154ef5
Change-Id: I3fa3ec32d3c580ba0b7f2d515e08d27dd6af5bcd
2020-02-12 06:25:42 +00:00
Chalard Jean
0900154ef5 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
2020-02-11 16:26:10 +08:00
Automerger Merge Worker
6f920f452d [automerger skipped] Merge "Fix review comments on aosp/1213524" am: 100e0b9a51 -s ours am: 79a71ed587 -s ours
am skip reason: Change-Id I621cfbe165996c67b201ca2dd2f95a5ab9af10ee with SHA-1 ab2fed7241 is in history

Change-Id: I6a138aa326a628fca7eda309f5627dd47a0ca56e
2020-02-11 03:52:28 +00:00
Automerger Merge Worker
79a71ed587 [automerger skipped] Merge "Fix review comments on aosp/1213524" am: 100e0b9a51 -s ours
am skip reason: Change-Id I621cfbe165996c67b201ca2dd2f95a5ab9af10ee with SHA-1 ab2fed7241 is in history

Change-Id: I1016fc76028aeafa9f15841b4e2951957aa11578
2020-02-11 03:43:38 +00:00
Aaron Huang
100e0b9a51 Merge "Fix review comments on aosp/1213524" 2020-02-11 03:33:08 +00:00
Chalard Jean
75a6104e2a Fix review comments on aosp/1213524
This is necessary to avoid subsequent conflicts.

Test: none needed
Change-Id: I6e2cd9188e0e4bd7c71c6c56635f192dce73f325
Merged-In: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
2020-02-10 08:28:04 +00:00
Automerger Merge Worker
a209886365 Merge "rm libbinderthreadstate" am: fc72c2ee39 am: 40c31cb9ee
Change-Id: I25aacc3f1cd9c3544e90934c37cff5a973a7bd7b
2020-02-09 23:44:07 +00:00
Automerger Merge Worker
40c31cb9ee Merge "rm libbinderthreadstate" am: fc72c2ee39
Change-Id: Ib7de947aa4ee5b349c9576355869702ac94d8624
2020-02-09 23:27:45 +00:00
Treehugger Robot
fc72c2ee39 Merge "rm libbinderthreadstate" 2020-02-09 23:06:21 +00:00
Automerger Merge Worker
7484cb5180 Merge "[NS A43] Separate updating the linger timer and sending LOSING" am: 30394e2a2b am: ad0dc3c5b3
Change-Id: Id7ed8f80307d2e1252195a6aef62e51d0c4e7f27
2020-02-09 07:21:19 +00:00
Automerger Merge Worker
2ce8a2baf3 Merge "[NS A42] Move writing to the reassignment to the computation" am: 358eb47a06 am: 52aa90906f
Change-Id: Iebe3dbd3b98f4b92486e86c48b0e50b6713b2aa6
2020-02-09 07:20:57 +00:00
Automerger Merge Worker
ad0dc3c5b3 Merge "[NS A43] Separate updating the linger timer and sending LOSING" am: 30394e2a2b
Change-Id: I4b8e7eec2df77d04700582542d6f3f2fb455c2af
2020-02-09 07:06:13 +00:00
Automerger Merge Worker
52aa90906f Merge "[NS A42] Move writing to the reassignment to the computation" am: 358eb47a06
Change-Id: Ic04c72d0720bb53a38329dbcbc75cd914e1296c0
2020-02-09 07:05:54 +00:00
Chalard Jean
30394e2a2b Merge "[NS A43] Separate updating the linger timer and sending LOSING" 2020-02-09 06:51:06 +00:00
Chalard Jean
358eb47a06 Merge "[NS A42] Move writing to the reassignment to the computation" 2020-02-09 06:50:48 +00:00
Automerger Merge Worker
1a43b229dd Merge "[NS A41] Cut out a function to update NAI info" am: 2d45ce0b69 am: 5c78cd3eac
Change-Id: If22b44893c33c3640a85eed7e6dc0ce888018059
2020-02-09 05:33:29 +00:00
Automerger Merge Worker
5c78cd3eac Merge "[NS A41] Cut out a function to update NAI info" am: 2d45ce0b69
Change-Id: I668fe3095ee9184b50db83d8f52f572dc57cfa1f
2020-02-09 05:09:07 +00:00
Chalard Jean
2d45ce0b69 Merge "[NS A41] Cut out a function to update NAI info" 2020-02-09 04:56:37 +00:00
Automerger Merge Worker
d8dd480bbf Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: 1e304edffd am: 80b276cbae
Change-Id: Iab752a848a8017fbfdc4517502d5a39d8201a682
2020-02-07 17:22:37 +00:00
Automerger Merge Worker
80b276cbae Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: 1e304edffd
Change-Id: Icaae03ca1895de4012deed1c1b81b16fad4ba439
2020-02-07 17:08:20 +00:00
Cody Kesting
1e304edffd Merge "Fix typo in ConnectivityDiagnosticsManager constant." 2020-02-07 16:57:19 +00:00
Steven Moreland
81c1f1dcc3 rm libbinderthreadstate
This library is empty, and its functionality has moved
into libbinder/libhwbinder.

Bug: 148692216
Test: N/A
Change-Id: I3ee973cef68281cb57b4912b4b66c798b5d9d715
2020-02-06 13:23:47 -08:00
Automerger Merge Worker
471de383b1 Merge "Use waitForIdle() to wait for Threaded processing." am: 75c1d97c4c am: 9970964bb1
Change-Id: I1d648dd7d700230afab893336ef853a41717ba80
2020-02-06 16:23:10 +00:00
Automerger Merge Worker
6574dcd23c Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." am: 0b3645740c am: 56fc4328d6
Change-Id: I44d75efacebae77914eda6da7efaaf11676e71fc
2020-02-06 16:22:50 +00:00
Automerger Merge Worker
c9da381fcc Merge "Implement INetworkMonitorCallbacks#notifyDataStallSuspected." am: daeccbf13e am: 1c80a4d95b
Change-Id: Iebcb87445b9bb7b36052c62160b4069b76432a18
2020-02-06 16:21:44 +00:00
Automerger Merge Worker
9970964bb1 Merge "Use waitForIdle() to wait for Threaded processing." am: 75c1d97c4c
Change-Id: Ida71ad5d045f87dd11877dc93d42885333bba336
2020-02-06 16:10:28 +00:00
Automerger Merge Worker
56fc4328d6 Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." am: 0b3645740c
Change-Id: I60d418afb145238981c17cc9a29ff57dc42c1ff0
2020-02-06 16:10:05 +00:00
Automerger Merge Worker
1c80a4d95b Merge "Implement INetworkMonitorCallbacks#notifyDataStallSuspected." am: daeccbf13e
Change-Id: I20aab2e77056df67df5bf9e9d6bd1888cf17a558
2020-02-06 16:08:33 +00:00
Cody Kesting
75c1d97c4c Merge "Use waitForIdle() to wait for Threaded processing." 2020-02-06 15:54:53 +00:00
Cody Kesting
0b3645740c Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." 2020-02-06 15:54:06 +00:00
Cody Kesting
daeccbf13e Merge "Implement INetworkMonitorCallbacks#notifyDataStallSuspected." 2020-02-06 15:47:26 +00:00
Chalard Jean
8fd82aea7e [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
383f5ef79a [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
24344d7e72 [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
dad0706510 Merge "[NS A40] Read current reassignment state instead of global state" am: 47dad79bf6 am: f614917d59
Change-Id: I897076fedc74a810e4eaeb530c496219e26ebbf1
2020-02-06 04:26:56 +00:00
Automerger Merge Worker
f614917d59 Merge "[NS A40] Read current reassignment state instead of global state" am: 47dad79bf6
Change-Id: I12ca40b29588c651c77d272bcde87fdbe8037f60
2020-02-06 04:23:11 +00:00
Chalard Jean
47dad79bf6 Merge "[NS A40] Read current reassignment state instead of global state" 2020-02-06 04:14:43 +00:00
Cody Kesting
d0bb3fe33a 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
5a9a2ae4b4 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
b12ad4ca3a 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
f497042938 Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." am: e10545c736 am: 89ee361837
Change-Id: I3b32a91106646e98cf52b4ca48eeb4ebacd164db
2020-02-05 20:23:52 +00:00
Automerger Merge Worker
89ee361837 Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." am: e10545c736
Change-Id: I39b74228c6c2a48ace7ad36dba995fa6f91bfbb5
2020-02-05 20:09:32 +00:00
Cody Kesting
e10545c736 Merge "Implement INetworkMonitorCallbacks#notifyNetworkTestedWithExtras." 2020-02-05 19:55:05 +00:00
Cody Kesting
83bb5fa762 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
c95f96910b 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
Automerger Merge Worker
813be534d6 Merge changes Ic1a5d032,I271e7f4d,I7af37281 am: f1211e9531 am: 089b1c3273
Change-Id: If59fd7e540dbb2fa49cb10e5193ad3b5e044b39e
2020-02-05 01:03:09 +00:00
Automerger Merge Worker
089b1c3273 Merge changes Ic1a5d032,I271e7f4d,I7af37281 am: f1211e9531
Change-Id: Ia1ec0ddbe841536f6525a9b5579603af620dae56
2020-02-05 00:59:17 +00:00
Chalard Jean
f1211e9531 Merge changes Ic1a5d032,I271e7f4d,I7af37281
* changes:
  [NS A39] Simplification
  [NS A38] Fill the initial reassignment
  [NS A37] Don't reassign requests multiple times
2020-02-05 00:53:28 +00:00
Automerger Merge Worker
21ef11a7dd Merge "Add separate user consent for Platform VPNs" am: e2684df6ef am: 05a3496121
Change-Id: If2d856c62b77da4bc8ea99335b1e89170f24fbca
2020-02-05 00:24:10 +00:00