Commit Graph

5114 Commits

Author SHA1 Message Date
Automerger Merge Worker
b3cb5f99d5 Merge "Add javadoc for Network#netId" am: 3294427e9b am: 2677915c8d
Change-Id: Ifcd5050d5d3499fece7fb359a6a4753333005e68
2020-03-12 10:30:05 +00:00
Mark Chien
3294427e9b Merge "Add javadoc for Network#netId" 2020-03-12 09:55:18 +00:00
markchien
34070e84f2 Add javadoc for Network#netId
Bug: 151156820
Test: m doc-comment-check-docs
Change-Id: Iea34a5c58a8b77c83258a39a8a44601e21a482f5
2020-03-12 09:54:44 +00:00
Aaron Huang
ea79b2ec19 Merge "Remove framework code that has moved to frameworks/libs/net" 2020-03-11 04:22:09 +00:00
Aaron Huang
ecbc722486 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
2020-03-10 06:45:16 +00:00
Automerger Merge Worker
039c94cecd Merge "Add missing RequiresPermission to EthernetManager" am: b3d7fe48ad am: 360c24f950
Change-Id: I03ba43bc3368241e260dbda25282af1fbef84260
2020-03-09 08:24:26 +00:00
Automerger Merge Worker
360c24f950 Merge "Add missing RequiresPermission to EthernetManager" am: b3d7fe48ad
Change-Id: I4263c0f0d315c6252eea921641c00fcd8d0e66cf
2020-03-09 08:12:48 +00:00
Remi NGUYEN VAN
b3d7fe48ad Merge "Add missing RequiresPermission to EthernetManager" 2020-03-09 07:42:25 +00:00
Remi NGUYEN VAN
bb5104fa13 Add missing RequiresPermission to EthernetManager
The method requires NETWORK_STACK or MAINLINE_NETWORK_STACK permissions,
but the annotation was missing.

Test: m
Fixes: 150877670
Change-Id: I2af74cbcfa642f05f5e7bf85b2a8e8c38595f6ca
2020-03-09 14:18:55 +09:00
Automerger Merge Worker
6e8621df53 Merge "Remove the NetworkScore class." am: d1edb37ac7 am: 709ec7c707
Change-Id: I5a14c3488b1f7011d49134819f659e3864b85f16
2020-03-08 05:26:15 +00:00
Automerger Merge Worker
709ec7c707 Merge "Remove the NetworkScore class." am: d1edb37ac7
Change-Id: Ieb78467dac3aca48eea9d049b83a74f9ff41eec7
2020-03-08 05:11:03 +00:00
Treehugger Robot
d1edb37ac7 Merge "Remove the NetworkScore class." 2020-03-08 04:52:26 +00:00
Aaron Huang
aa078c03c4 Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master 2020-03-06 05:53:20 +00:00
Chalard Jean
36b29acbc5 Remove the NetworkScore class.
This class is useless at this point and introduces overhead.

Bug: 113554781
Test: FrameworksNetTests
Change-Id: Ib6da6c1c7f2a0b97c847d2e64e5ce16dd821e1e7
2020-03-06 11:57:53 +09:00
Automerger Merge Worker
f8a55a19fa Merge "Remove polling of TetheringManager in ConnectivityManager." am: 7ced7df125 am: c1314bb84f
Change-Id: I7d88b38eb3d741534e980b7d1e226a411b71fae2
2020-03-06 00:38:43 +00:00
Amos Bianchi
7ced7df125 Merge "Remove polling of TetheringManager in ConnectivityManager." 2020-03-05 18:34:59 +00:00
Amos Bianchi
b118c9b72b Remove polling of TetheringManager in ConnectivityManager.
Test: manual

Bug: 144742179

Change-Id: I196b320788be96c120f771d2fcdf032a73e26b5f
2020-03-05 18:34:14 +00:00
Aaron Huang
04b394d07b 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
2020-03-05 13:53:39 +08:00
Automerger Merge Worker
305ecb9aff Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 63e5bd6b4b am: 21f010984f
Change-Id: Ifb0b5b9742a9a4c0c4c1845c647184d65cff8e4f
2020-03-04 10:50:48 +00:00
Automerger Merge Worker
21f010984f Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 63e5bd6b4b
Change-Id: I1ab6d47c17992f8630d9aba892bcef29dcb66bfa
2020-03-04 10:32:09 +00:00
Paul Hu
63e5bd6b4b Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" 2020-03-04 10:15:41 +00:00
Automerger Merge Worker
465199b9a0 Merge "Move DnsSdTxtRecord to net common static library" am: 8d6a6e0d4b
Change-Id: I1101a06ab084e1ff61a785f78b1ae5ac50bfbcd8
2020-03-04 05:56:55 +00:00
Aaron Huang
8d6a6e0d4b Merge "Move DnsSdTxtRecord to net common static library" 2020-03-04 05:33:30 +00:00
paulhu
b7817e287c 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
Automerger Merge Worker
ed139f5d9f Merge "Update NetworkInfo public API." am: 9dbdb7a01e
Change-Id: I6658d79bd9bda22ed6b8acac90ba94c9ef18c488
2020-03-03 09:40:07 +00:00
Aaron Huang
9dbdb7a01e Merge "Update NetworkInfo public API." 2020-03-03 09:16:55 +00:00
Automerger Merge Worker
3060c3cd98 Merge changes from topic "del-factory-and-networkagent-wifi" am: 97cc9b621a
Change-Id: I8b8e4add020ec8011bc1d41fc6537f750c309754
2020-03-03 03:54:02 +00:00
Automerger Merge Worker
1cb0560dc2 New NetworkAgentConfig API to replace NetworkInfo WiFi stuff. am: 490e292a76
Change-Id: I94e3b25aa202e75338115f82c6db0dd0e41deb48
2020-03-03 03:53:58 +00:00
Automerger Merge Worker
73e201927e Merge "Move NetworkAgent#register to a new method." am: 9309eea2fe
Change-Id: I4ca48f4232ad4733da5ce7f265fc911f5ff1a713
2020-03-03 03:52:17 +00:00
Aaron Huang
97cc9b621a 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
9309eea2fe Merge "Move NetworkAgent#register to a new method." 2020-03-03 03:37:07 +00:00
Automerger Merge Worker
65e5a45a6b 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
Aaron Huang
1752fcf3c8 Move DnsSdTxtRecord to net common static library
DnsSdTxtRecord is moved to frameworks/libs/net for mainline
support. Also change the import path using this class.

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

Change-Id: I6118b313ce668707d598aa2eab9baee2f7622dbc
Merged-In: I6118b313ce668707d598aa2eab9baee2f7622dbc
2020-03-02 08:21:26 +00:00
Aaron Huang
7cadca43f2 Merge "Remove framework code that has moved to frameworks/libs/net" 2020-03-02 06:23:44 +00:00
Automerger Merge Worker
4be9a47a39 Merge "Always set NetworkInfo objects to available." am: ac916d6e2b
Change-Id: I89b53d1a254ca43566286b1309ce88b8a1518c4a
2020-03-02 05:10:35 +00:00
Aaron Huang
ac916d6e2b Merge "Always set NetworkInfo objects to available." 2020-03-02 04:53:10 +00:00
Chalard Jean
a11593c24e Revert "Add public fields to NetworkScore and make it @SystemApi"
This reverts commit a27e1eef14.

Bug: 113554781
Test: FrameworksNetTests FrameworksTelephonyTests FrameworksWifiTests
Change-Id: Ie1e84bd2a16f088307b195f924f4e49335cbe367
2020-02-28 06:26:27 +00:00
Automerger Merge Worker
0b64d65f28 Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df am: d74f557cbf
Change-Id: I64f6f64c643e626380403d3e15c6ed4b5f2330ef
2020-02-28 03:04:11 +00:00
Automerger Merge Worker
d74f557cbf Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df
Change-Id: Idd4eca225909f88ef6d57fd8952ae497ec82115b
2020-02-28 02:49:58 +00:00
Lorenzo Colitti
41c82c99df Merge "Fix crash and duplicated ethernet tethering request" 2020-02-28 02:37:45 +00:00
markchien
d2d8d45b89 Fix crash and duplicated ethernet tethering request
This change fix two things:
1. Handle ethernet callback in internal thread to avoid crash. IpServer
should be created from tethering thread, otherwise mIpNeighborMonitor of
IpServer would throw
   IllegalStateException("start() called from off-thread")
2. Ethernet tethering request may be duplicated if multiple
startTethering is called but no stopTethering

Bug: 130840861
Bug: 148824036
Test: ON/OFF ethernet tehtering manually
      atest TetheringTests

Change-Id: I7c5127e96d80d077735010d2e62c7227805ccb10
2020-02-27 14:50:16 +08:00
Automerger Merge Worker
33086f9d78 Merge "Add methods to send connected/disconnected state." am: bdb86ff8ab
Change-Id: If69bd650e129dc9f058e47832d48651b9243a3bb
2020-02-27 03:23:48 +00:00
Chalard Jean
48413166fb 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
94fa6dc345 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
Chalard Jean
9bcd42255b Revert "[NS D02] Mix in the ignore on wifi policy."
This reverts commit 14af825dbe.

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

Change-Id: Id9ecdac5292eeddf7c12f2330421248b0f8355a9
2020-02-21 09:28:18 +00:00
TreeHugger Robot
f748ca137e 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
Lorenzo Colitti
e81ef45b29 Delete NetworkFactory from frameworks/base/core.
It is being moved to frameworks/libs/net.

Test: builds
Test: atest FrameworksNetTests
Test: atest FrameworksWifiTests
Test: atest FrameworksTelephonyTests
Bug: 138306002
Bug: 139268426
Change-Id: I4eec40bed93679a029a20d38c114b1dbc80aa12e
Merged-In: I4eec40bed93679a029a20d38c114b1dbc80aa12e
2020-02-21 16:20:54 +08:00
Chalard Jean
490e292a76 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
e668251eee 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
4bdb2cf7a0 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