Commit Graph

8711 Commits

Author SHA1 Message Date
junyulai
c05d1359b4 Remove setHandler in NetworkStatsService
Currently, internal handler is set by setHandler after
constructing NSS object. This was introduced in ag/866187 to
access the handler in the unit test.

However, the design put NSS in a bad situation where all classes
that need handler or executor could not be final and need to be
dynamically allocated in order to get a valid handler.

Thus, since the usage of handler is removed in previous patch,
this change eliminate setHandler by initializing the handler in
the constructor.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: I794a24d00b0ca9fdc78091e7b9ab7307e0f034b7
2020-03-04 16:01:21 +08:00
Automerger Merge Worker
a698836db0 Merge "Add more assertions to testStackedLinkProperties." am: bb77aa9ddd am: d778ebc099
Change-Id: I4f5dc651847aae2dfc61b1f5234bab5f899feacb
2020-03-04 04:53:17 +00:00
Automerger Merge Worker
d778ebc099 Merge "Add more assertions to testStackedLinkProperties." am: bb77aa9ddd
Change-Id: I6987dc9c80b8d48c8354f654f21b056d2bd896c5
2020-03-04 04:36:38 +00:00
Lorenzo Colitti
bb77aa9ddd Merge "Add more assertions to testStackedLinkProperties." 2020-03-04 04:24:34 +00:00
paulhu
b6ba8e84f4 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
2020-03-04 09:43:41 +08:00
Lorenzo Colitti
2e6a35ef5e Add more assertions to testStackedLinkProperties.
Check all routes that are added and removed instead of just some
of them. This is in preparation of an upcoming change that
switches to adding and creating routes by issuing direct calls to
netd.

Also rename the misleading ipv4Default route variable to
ipv4Subnet, which is what it actually is.

Bug: 142892223
Test: test-only change
Change-Id: I7d111382be215a926a7d7d4701bd3c3e94372b99
2020-03-03 21:48:18 +09:00
Automerger Merge Worker
86cbebbe29 [automerger skipped] Merge "Update NetworkInfo public API." am: a159122013 am: f500dafbdb -s ours
am skip reason: Change-Id Ic50d9b5c65e8771708620badc3bc242a8ffbb5cc with SHA-1 04a2e63ed8 is in history

Change-Id: I7d6cc58a43ced0ee618ebd2dc23537d767db5eee
2020-03-03 09:53:12 +00:00
Automerger Merge Worker
f500dafbdb Merge "Update NetworkInfo public API." am: a159122013
Change-Id: I6658d79bd9bda22ed6b8acac90ba94c9ef18c488
2020-03-03 09:40:07 +00:00
Aaron Huang
a159122013 Merge "Update NetworkInfo public API." 2020-03-03 09:16:55 +00:00
junyulai
3123092fd5 Remove the need of accessing handler in NSS unit test
Currently, to wait for handler becomes idle, specific message
is used and the test would wait for condition variable to be
open when the message is processed.

However, this is already done in the HandlerUtils. Thus,
there is no need to post such message manually in the handler.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: Iab32b2dbab01634ca159dcb90fc9f929d1fed1a2
2020-03-03 16:27:03 +08:00
Automerger Merge Worker
7fb8097efd [automerger skipped] Merge changes from topic "del-factory-and-networkagent-wifi" am: ea4d07c802 am: 999c531e90 -s ours
am skip reason: Change-Id I4eec40bed93679a029a20d38c114b1dbc80aa12e with SHA-1 a0d43919ba is in history

Change-Id: I9ef0d966631f1fbdea09d0e443bbe42c541bd6c5
2020-03-03 04:09:14 +00:00
Automerger Merge Worker
6aabf9ac9d [automerger skipped] New NetworkAgentConfig API to replace NetworkInfo WiFi stuff. am: cd457ea5ec am: 6bef08258f -s ours
am skip reason: Change-Id Id13fcf41e05fd1eb26c86717e2684c724b94e401 with SHA-1 5f617f9a07 is in history

Change-Id: Ie3ca4a47c607c630bdae63cd7665c3737901404e
2020-03-03 04:09:06 +00:00
Automerger Merge Worker
b3a303e870 [automerger skipped] Merge "Move NetworkAgent#register to a new method." am: 5d61bc285d am: 7c9677256c -s ours
am skip reason: Change-Id I1ee5c7b1353d581e487c8a8a159009bebd781643 with SHA-1 01b6ba4053 is in history

Change-Id: Ib0a33a398cafb9d2f5fcb39a3e31929c2b088c94
2020-03-03 04:08:33 +00:00
Automerger Merge Worker
999c531e90 Merge changes from topic "del-factory-and-networkagent-wifi" am: ea4d07c802
Change-Id: I8b8e4add020ec8011bc1d41fc6537f750c309754
2020-03-03 03:54:02 +00:00
Automerger Merge Worker
6bef08258f New NetworkAgentConfig API to replace NetworkInfo WiFi stuff. am: cd457ea5ec
Change-Id: I94e3b25aa202e75338115f82c6db0dd0e41deb48
2020-03-03 03:53:58 +00:00
Automerger Merge Worker
7c9677256c Merge "Move NetworkAgent#register to a new method." am: 5d61bc285d
Change-Id: I4ca48f4232ad4733da5ce7f265fc911f5ff1a713
2020-03-03 03:52:17 +00:00
Aaron Huang
ea4d07c802 Merge changes from topic "del-factory-and-networkagent-wifi"
* changes:
  Delete NetworkFactory from frameworks/base/core.
  New NetworkAgentConfig API to replace NetworkInfo WiFi stuff.
2020-03-03 03:47:31 +00:00
Aaron Huang
5d61bc285d Merge "Move NetworkAgent#register to a new method." 2020-03-03 03:37:07 +00:00
Automerger Merge Worker
44e7635499 Merge "Revert "Add public fields to NetworkScore and make it @SystemApi"" into rvc-dev am: 543ff5f068
Change-Id: I083210a43e2f7a40ea5edb8d2cb34e185bc2f1ce
2020-03-02 23:34:16 +00:00
Automerger Merge Worker
3712615195 [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: fcca217a94 -s ours am: 7f812a02cf -s ours
am skip reason: Change-Id Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef with SHA-1 2429c7091c is in history

Change-Id: I31576f49f7c7eb800f203a0133433a15b03391ad
2020-03-02 10:27:40 +00:00
Automerger Merge Worker
7f812a02cf [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: fcca217a94 -s ours
am skip reason: Change-Id Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef with SHA-1 5ff8baa340 is in history

Change-Id: Ia18edfd8fed3ec197fcacd086c4b7fe2f4b5f47d
2020-03-02 10:12:36 +00:00
Aaron Huang
fcca217a94 Merge "Remove framework code that has moved to frameworks/libs/net" 2020-03-02 06:23:44 +00:00
Automerger Merge Worker
84250f5565 [automerger skipped] Merge "Always set NetworkInfo objects to available." am: e8a5275bc9 am: 9b08eb340a -s ours
am skip reason: Change-Id Ia9876b0ce7f02120bd05cab526346cad22cf62b3 with SHA-1 109d5dc28b is in history

Change-Id: I1dc94a163f65c12fefa26c36f567c28de1f5408d
2020-03-02 05:20:24 +00:00
Automerger Merge Worker
9b08eb340a Merge "Always set NetworkInfo objects to available." am: e8a5275bc9
Change-Id: I89b53d1a254ca43566286b1309ce88b8a1518c4a
2020-03-02 05:10:35 +00:00
Aaron Huang
e8a5275bc9 Merge "Always set NetworkInfo objects to available." 2020-03-02 04:53:10 +00:00
Chalard Jean
fdb872c4ed Revert "Add public fields to NetworkScore and make it @SystemApi"
This reverts commit 511f7e3792.

Bug: 113554781
Test: FrameworksNetTests FrameworksTelephonyTests FrameworksWifiTests
Change-Id: Ie1e84bd2a16f088307b195f924f4e49335cbe367
2020-02-28 06:26:27 +00:00
Automerger Merge Worker
d755604909 [automerger skipped] Merge "Add methods to send connected/disconnected state." am: 40dba07dc3 am: f0de11d057 -s ours
am skip reason: Change-Id Ie90b8d290eab490061d5cb066744b67d597b9469 with SHA-1 101719ce8e is in history

Change-Id: I17fbd370c969a11b9fd91de99ec6abc045db0e83
2020-02-27 03:36:12 +00:00
Automerger Merge Worker
f0de11d057 Merge "Add methods to send connected/disconnected state." am: 40dba07dc3
Change-Id: If69bd650e129dc9f058e47832d48651b9243a3bb
2020-02-27 03:23:48 +00:00
Aaron Huang
40dba07dc3 Merge "Add methods to send connected/disconnected state." 2020-02-27 03:21:14 +00:00
Automerger Merge Worker
d537c904e0 Merge "test: ConnectivityService: Validate Route Add/Del" am: 08c82181ad am: bbc8c579c4
Change-Id: I06cfe0f02c6971afade5a844958b1a2bd4977d80
2020-02-27 01:16:45 +00:00
Automerger Merge Worker
bbc8c579c4 Merge "test: ConnectivityService: Validate Route Add/Del" am: 08c82181ad
Change-Id: I020c5cf1da94de7a68ec70cc1a38ea70aaf703d0
2020-02-27 01:06:34 +00:00
Lorenzo Colitti
08c82181ad Merge "test: ConnectivityService: Validate Route Add/Del" 2020-02-27 01:00:58 +00:00
Tyler Wear
5668f7198b test: ConnectivityService: Validate Route Add/Del
Validate route addition and deletion after linkProperties are
changed.

Test: atest ConnectivityServiceTest#testStackedLinkProperties
Change-Id: I18296b933e856a0f8a4c1dbd75bd35024853bfbb
2020-02-24 17:23:02 -08:00
Automerger Merge Worker
4788a71974 Merge "test: LinkProperties: Unique Route Destinations" am: c3f8d41d4d am: fb5ed4b678
Change-Id: Id4d5588946f0cf3418140a5da660649d417b8165
2020-02-25 00:56:07 +00:00
Automerger Merge Worker
fb5ed4b678 Merge "test: LinkProperties: Unique Route Destinations" am: c3f8d41d4d
Change-Id: I9261a5e5f6b18390aac34cd25337f211b19a7641
2020-02-25 00:46:25 +00:00
Lorenzo Colitti
c3f8d41d4d Merge "test: LinkProperties: Unique Route Destinations" 2020-02-25 00:34:07 +00:00
Chalard Jean
4d5537853a Update NetworkInfo public API.
Wifi needs to create these objects so it can include them
in the broadcasts.

Bug: 135998869
Test: FrameworksWifiTests
Change-Id: Ic50d9b5c65e8771708620badc3bc242a8ffbb5cc
Merged-In: Ic50d9b5c65e8771708620badc3bc242a8ffbb5cc
2020-02-24 21:07:08 +08:00
Chalard Jean
4c2f233f6b Merge changes Ia91b3b3c,Id9ecdac5,I4b17d1b1
* changes:
  Revert "[NS D01] Remove candidates that don't satisfy the request."
  Revert "[NS D02] Mix in the ignore on wifi policy."
  Revert "Address comments on ag/10316753"
2020-02-21 11:06:55 +00:00
Automerger Merge Worker
f76bed30a9 Merge "Remove useless thread checks" am: 269d32a0fa am: bb87d5aeb5 am: 374e1adce8
Change-Id: Ib091ec185495184867b77528aee7492b9b571ada
2020-02-21 10:21:50 +00:00
Automerger Merge Worker
374e1adce8 Merge "Remove useless thread checks" am: 269d32a0fa am: bb87d5aeb5
Change-Id: I7a1fe60971b733cb6bc3c848eeed8624210d97ff
2020-02-21 10:00:45 +00:00
Automerger Merge Worker
bb87d5aeb5 Merge "Remove useless thread checks" am: 269d32a0fa
Change-Id: I1dc9ce4e5ef5ca2012264fdb736606a36f20c8a3
2020-02-21 09:37:21 +00:00
Chalard Jean
d15ca10d6d Revert "[NS D01] Remove candidates that don't satisfy the request."
This reverts commit a19115d482.

Reason for revert: The feature was punted out of R.

Change-Id: Ia91b3b3c55f735dae64ffa3194614a6f2631a087
2020-02-21 09:29:00 +00:00
Chalard Jean
1d9a206bca Revert "[NS D02] Mix in the ignore on wifi policy."
This reverts commit 7a56387e2c.

Reason for revert: The feature was punted out of R.

Change-Id: Id9ecdac5292eeddf7c12f2330421248b0f8355a9
2020-02-21 09:28:18 +00:00
TreeHugger Robot
7bcd12e7d2 Merge changes from topic "revert-10338939-YCRBMILGZV"
* changes:
  Revert "[NS D03] Migrate the bad wifi avoidance policy"
  Revert "[NS D04] Implement a simple speed comparison between scores."
2020-02-21 08:51:09 +00:00
Chalard Jean
cd457ea5ec New NetworkAgentConfig API to replace NetworkInfo WiFi stuff.
Bug: 139268426
Test: FrameworkWifiTests
Change-Id: Id13fcf41e05fd1eb26c86717e2684c724b94e401
Merged-In: Id13fcf41e05fd1eb26c86717e2684c724b94e401
2020-02-21 16:08:17 +08:00
Chalard Jean
99ae3ad2e5 Remove useless thread checks
Because we liked to be really sure.

Test: ConnectivityServiceTests
Change-Id: I8d66257777d4c5b6ca097a5f2575d0872fae05dd
2020-02-21 17:00:49 +09:00
TreeHugger Robot
e60c52cb89 Merge changes from topic "revert-10343065-HRWTWGOFZV"
* changes:
  Revert "[NS D05] Rework how to tear down networks"
  Revert "[NS D06] Implement more policies"
  Revert "[NS D07] Use the unmodified legacy score"
2020-02-21 07:53:30 +00:00
Chalard Jean
5863a71547 Move NetworkAgent#register to a new method.
Calling IPC in a constructor is unusual and confusing, and can be
considered bad form. There are multiple reasons for this :
• Users can't obtain an instance of the class without calling the
  constructor, but they can't always afford an IPC where they need
  this, forcing them to know about the implementation detail and
  sometimes design around it.
• On a related but generalized note, constructors should usually
  be fast for the same range of reasons.
• Having a separate method to register the agent simply gives more
  flexibility to the app.
• It's also a lot easier to test.
But also we can't fix it without an update to the API, so here it is.

Another reason for doing this is consistency with the NetworkProvider
API.

Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I1ee5c7b1353d581e487c8a8a159009bebd781643
Merged-In: I1ee5c7b1353d581e487c8a8a159009bebd781643
(clean cherry-pick from internal branch)
2020-02-21 14:54:18 +08:00
Chalard Jean
7b6b7ecc19 Revert "[NS D03] Migrate the bad wifi avoidance policy"
Revert submission 10338939

Reason for revert: The feature was punted out of R.
Reverted Changes:
I32c12702c:[NS D04] Implement a simple speed comparison betwe...
I688593cc0:[NS D03] Migrate the bad wifi avoidance policy

Change-Id: I640635a1ed94bed3b53466abe2a988caf0eca2b0
2020-02-21 06:47:35 +00:00
Chalard Jean
6f677ac620 Revert "[NS D04] Implement a simple speed comparison between scores."
Revert submission 10338939

Reason for revert: The feature was punted out of R.
Reverted Changes:
I32c12702c:[NS D04] Implement a simple speed comparison betwe...
I688593cc0:[NS D03] Migrate the bad wifi avoidance policy

Change-Id: I28172721d3f3af82ac79ef2c8f61df39943d997b
2020-02-21 06:46:06 +00:00