Commit Graph

3492 Commits

Author SHA1 Message Date
TreeHugger Robot
c645bc09ad Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: 890252cbbf am: 26789cc723 am: 3e2c8372cb
Change-Id: I917241b0fa701f39eb937fc60517ac970a8c4522
2020-04-07 14:24:55 +00:00
TreeHugger Robot
c524ad59f3 Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev 2020-04-07 13:38:37 +00:00
Roshan Pius
573e3fe6be WifiNetworkSpecifier: Ensure we don't match a regular wifi network
In Android 10, ClientModeImpl would always attach a
WifiNetworkAgentSpecifier for all wifi network agents created
(regardless of whether it was created in response to a specific request
or not). In Android 11, we changed that behavior to ensure that we
attach the WifiNetworkAgentSpecifier only for agents created in response
to a specific request. However, that is exposing a bug in
WifiNetworkSpecifier matching. WifiNetworkSpecifier attached requests
should not satisfy a generic wifi network agent. Fix the
canSatisfiedBy() matching to ensure that it only matches
WifiNetworkAgentSpecifier (or itself which cannot happen during network
matching)

Bug: 149500993
Test: Add a saved network manually while running the failing ACTS test:
act.py -c wifi_manager_cross.config -tb dut-name -tc WifiNetworkRequestTest:
test_match_failure_with_invalid_ssid_pattern
Test: atest android.net.wifi

Change-Id: I38d154bd0a5685fcc38de891256a8e1d4b8cfbb5
2020-04-07 06:45:46 +00:00
David Su
efd1eb6dfd Merge "framework-wifi: Remove dependency on framework-telephony-stubs" into rvc-dev am: 7309ac6092 am: 1d0f0aa56f am: 29371dafc0 am: 892d8ef539
Change-Id: I292e3452393498d861a83f9c7c30f87f8f885dfc
2020-04-06 19:43:27 +00:00
David Su
7309ac6092 Merge "framework-wifi: Remove dependency on framework-telephony-stubs" into rvc-dev 2020-04-06 19:01:46 +00:00
David Su
34fc65accf framework-wifi: Remove dependency on framework-telephony-stubs
Since Telephony is no longer a module, `framework-telephony-stubs`
is already part of `module_current`. Only stubs from other modules
need to be explicitly included.

Bug: 151092414
Test: compiles
Change-Id: Iedf05a82dea9e6831b6253dfcb213162d2b9e127
2020-04-04 01:37:28 -07:00
Automerger Merge Worker
80e31eb4bb Merge "Merge "Merge "WifiManager: Update doc for new metered change behavior" into rvc-dev am: 8a31e59ece am: 263775dd2e" into rvc-d1-dev-plus-aosp am: 510a6bb7a4" into rvc-qpr-dev-plus-aosp am: b85622287c
Change-Id: Ic8b2c19fffd34021a088d97c5069289ae4db1959
2020-04-04 01:30:07 +00:00
Roshan Pius
8a31e59ece Merge "WifiManager: Update doc for new metered change behavior" into rvc-dev 2020-04-04 00:31:04 +00:00
Hai Shalom
cf2c73e533 Merge "[DPP] Fix typo in javadoc for SUCCESS_CONFIGURATION_APPLIED" into rvc-dev am: faac9ca5a9 am: d3803377e6 am: d5eaaf4a01 am: 6ad0a040b1
Change-Id: Id0f022cf2fca2c4b7ad2ffa79a6548f7fdf62e19
2020-04-03 21:12:01 +00:00
Roshan Pius
12e167b30e WifiManager: Update doc for new metered change behavior
Also, explictitly mark OVERRIDE_NOT_METERED in WifiConfiguration
when suggestion is not metered.

Bug: 153127005
Test: Compiles
Change-Id: I917de747406167fc38faa05e15d98a9b867a6ce8
2020-04-03 13:27:50 -07:00
Hai Shalom
faac9ca5a9 Merge "[DPP] Fix typo in javadoc for SUCCESS_CONFIGURATION_APPLIED" into rvc-dev 2020-04-03 20:21:34 +00:00
Hai Shalom
c5962ff651 [DPP] Fix typo in javadoc for SUCCESS_CONFIGURATION_APPLIED
Bug: 153015500
Test: No code changes
Change-Id: I3275680ccd6161b703ad60dbe82e558fc17e37e5
2020-04-01 15:55:20 -07:00
Anton Hansson
85dac89fc9 Merge "Remove build workaround for wifi stubs" into rvc-dev am: 2c592f0df3 am: 9686c1c57b am: ece81ff32a am: 3971221270
Change-Id: Ib3d67634aa1d43c49149588087876f967888d6b5
2020-03-31 21:48:56 +00:00
Automerger Merge Worker
6757a650eb Merge "Merge "Add wifi util lib to classpath for wifi stubs" into rvc-dev am: b51f33f4cd am: 1f30cd976c" into rvc-d1-dev-plus-aosp am: cd6e0712c4 am: 67cf6e2e8a
Change-Id: I633057306da46d6afd688540a42c6ac3d4bdad00
2020-03-31 20:53:16 +00:00
Anton Hansson
2c592f0df3 Merge "Remove build workaround for wifi stubs" into rvc-dev 2020-03-31 19:42:28 +00:00
Anton Hansson
2e53a5302b Add wifi util lib to classpath for wifi stubs
Fixes the individual wifi stubs to match those in the monolithic
current.txt.

Bug: 152857194
Test: diff <(cat api/system-current.txt | grep 'class RttManager {' -A30) \
           <(cat wifi/api/system-current.txt | grep 'class RttManager {' -A30) \
      && echo pass || echo fail
Change-Id: I3fc8a87e83f8dfee8d97966ead379d7acf0807bc
2020-03-31 15:45:00 +01:00
Anton Hansson
8256aad305 Remove build workaround for wifi stubs
b/151134996 is fixed now.

Bug: 151134996
Test: m framework-wifi-stubs-publicapi
Change-Id: Ia5c07faaca18c663d02c705aca0a7b7622a95e5f
2020-03-30 14:17:35 +01:00
Automerger Merge Worker
39cff398a9 Merge changes from topic "am-bf6e2799d1e74eec9933cc934f005929" into rvc-qpr-dev-plus-aosp am: 0e1a2f47e4
Change-Id: I35dc84048c963f08ee164f84aa56061434632115
2020-03-27 23:39:24 +00:00
Chalard Jean
996492f866 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
  Update the NetworkProvider API for council comments
2020-03-27 22:50:42 +00:00
Chalard Jean
2da4f9f9ae Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
2020-03-27 23:46:30 +09:00
Artur Satayev
8612937cb6 Remove unsupportedappusage-annotation library.
It is not needed anymore, and is replaced by "unsupportedappusage" library.

Bug: 145132366
Test: m
Change-Id: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Merged-In: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Exempt-From-Owner-Approval: clean up
2020-03-26 14:40:16 +00:00
Artur Satayev
8fb2881161 Merge "Remove unsupportedappusage-annotation library." 2020-03-26 10:49:42 +00:00
Artur Satayev
fc864b4acf Remove unsupportedappusage-annotation library.
It is not needed anymore, and is replaced by "unsupportedappusage" library.

Bug: 145132366
Test: m
Change-Id: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Exempt-From-Owner-Approval: clean up
2020-03-26 10:49:22 +00:00
Les Lee
0b374d4da9 Merge "wifi: Support setBssid for tethered mode hotspot" into rvc-dev am: d6f3212620 am: 04e593c4ba am: 67a3681112 am: a9204a7f17
Change-Id: If648cc1647d56faf3c4c6f956fe48142390e546e
2020-03-26 01:29:12 +00:00
Les Lee
d6f3212620 Merge "wifi: Support setBssid for tethered mode hotspot" into rvc-dev 2020-03-26 00:23:14 +00:00
Nate Jiang
1bb1ce9de6 Merge "Keep most recently connection network flag" into rvc-dev am: 0ccefbe94b am: 22db1b3c9d am: 67187462b3 am: aa86bcfbd8
Change-Id: I5d2abcdea842ed3a4865821a65150f4a59f36246
2020-03-25 19:31:12 +00:00
Nate Jiang
0ccefbe94b Merge "Keep most recently connection network flag" into rvc-dev 2020-03-25 18:10:13 +00:00
Automerger Merge Worker
740c90ea54 Merge "Merge "Make framework-wifi stubs use the new defaults" into rvc-dev am: 3544feedb7 am: dbf582efb9" into rvc-d1-dev-plus-aosp am: 879fe65e0b am: 132e185b6b
Change-Id: Id60d097ee8386ff3acb3687d0e2385728605fd62
2020-03-25 16:31:35 +00:00
Anton Hansson
3544feedb7 Merge "Make framework-wifi stubs use the new defaults" into rvc-dev 2020-03-25 13:21:40 +00:00
Automerger Merge Worker
4423aeb47b Merge "Merge "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds" into rvc-dev am: 9c493f4722 am: 7c107291f5 am: cfabc8189a" into rvc-qpr-dev-plus-aosp am: 6547cfd9ff
Change-Id: I42f5073994e6d0b3cbcc972cd11734c93285dcf7
2020-03-24 20:33:09 +00:00
Anton Hansson
013dc72801 Make framework-wifi stubs use the new defaults
Makes it convenient to change all stubs from a central place.

Bug: 149293194
Test: m framework-wifi-stubs{public,system,module_libs_}api
Change-Id: Ie857558b507c90dd46a7777c82f14d7d45422222
2020-03-24 19:50:06 +00:00
David Su
9c493f4722 Merge "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds" into rvc-dev 2020-03-24 19:14:07 +00:00
lesl
b1c47a7641 wifi: Support setBssid for tethered mode hotspot
PS: Remove BSSID convert to WifiConfiguration since BSSID field doesn't
use in WifiConfiguration usage on SoftAp.

Bug: 152180102
Test: atest frameworks/base/wifi/test/
Change-Id: Id781ff6af222fe1d557560feaa44b5d2761c3a81
2020-03-24 21:26:31 +08:00
Roshan Pius
988712df08 Merge "WifiMigration: Add a settings key to indicate migration is complete" into rvc-dev am: 5f176bf91e am: cecebfae5a am: 3721e105fd am: b64acacd04
Change-Id: I8c58998a68bf0352428ef809b566b86361ddf0f1
2020-03-24 06:00:00 +00:00
Roshan Pius
5f176bf91e Merge "WifiMigration: Add a settings key to indicate migration is complete" into rvc-dev 2020-03-24 05:11:50 +00:00
Vladimir Marko
76d81f0b7c Merge "Add permitted_packages to framework-wifi." into rvc-dev am: 82f2060f55 am: 59668b470b am: 9e5f2ac76c am: 35e5a4c98d
Change-Id: I089a251a05c2c1b65cabd93c81a8ddc4a71e3eb5
2020-03-24 02:36:13 +00:00
Roshan Pius
849a6f78a5 WifiMigration: Add a settings key to indicate migration is complete
Bug: 151888061
Test: Manual verification (ensured that this method returns null after
first reboot)

Change-Id: Ie8ad397c7b68e35cfa7b696ef22d84f376cf3fe7
2020-03-23 18:48:28 -07:00
David Su
87d6a79f2f frameworks/base/wifi/tests: Run mts-wifi on AOSP builds
This is a temporary workaround for mts-wifi to
run on AOSP builds, since on those devices the
Wifi package name is `com.android.wifi` and not
`com.google.android.wifi`.

Bug: 151836001
Test: continuous runs
Change-Id: I11baae67e10638acd8c24ae0fab92e5b2bfca6e4
2020-03-23 16:14:54 -07:00
Vladimir Marko
82f2060f55 Merge "Add permitted_packages to framework-wifi." into rvc-dev 2020-03-23 20:43:18 +00:00
Ashwini Oruganti
e989c5e734 Merge "Add an exported flag in manifest" 2020-03-23 18:38:40 +00:00
Ashwini Oruganti
e178c24db3 Add an exported flag in manifest
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.

Bug: 150232615
Test: TH
Exempt-From-Owner-Approval: mechanical refactoring
Change-Id: I4457ff2bd466a4c56fed2570e110f251031c2385
2020-03-23 18:34:09 +00:00
Les Lee
1d37c9ba93 Merge "wifi: Add OVERRIDE_WIFI_CONFIG in set/getSoftApConfiguration" 2020-03-23 02:37:21 +00:00
TreeHugger Robot
162db72a8a Merge "WifiMigration: Add sample config store XML files" into rvc-dev 2020-03-20 23:02:58 +00:00
Michael Wright
b99ba10bec Merge "Make ScanResult final." into rvc-dev 2020-03-20 19:02:10 +00:00
Roshan Pius
da0704b275 WifiMigration: Add sample config store XML files
Also, added a readme to list the different sample files.

Bug: 152048434
Test: Compiles
Change-Id: If15ec11fd36b327ac4942f97a49ff04abc1cbd0f
2020-03-20 11:57:48 -07:00
lesl
6b1a7ee59c wifi: Add OVERRIDE_WIFI_CONFIG in set/getSoftApConfiguration
Bug: 151998061
Test: atest FrameworksWifiTest
Change-Id: Id0e116ffcc875290f512fa4b2204534a6084eaa5
2020-03-20 14:43:12 +00:00
Vladimir Marko
8a71e9b9e3 Add permitted_packages to framework-wifi.
Test: m out/soong/.intermediates/frameworks/base/wifi/framework-wifi/android_common/package-check.stamp
Bug: 151314205
Change-Id: If04aa602c2e628243fe6cb3545db912a1179c5d5
2020-03-20 11:32:54 +00:00
David Su
70cd6d61e3 Merge "Remove WifiManager.getTxPacketCount" into rvc-dev 2020-03-19 23:59:14 +00:00
David Su
15c3b29222 Remove WifiManager.getTxPacketCount
This is no longer called by CTS, and has no other
clients.

This also removes the dependency on
WifiNl80211Manager.getTxPacketCounters(), so it
will no longer need test coverage.

Bug: 150978929
Test: atest FrameworksWifiApiTests
Change-Id: Ia64a6b2f5009c021ed7dd66c24e854996995778a
2020-03-19 12:51:02 -07:00
Nate Jiang
ca5ea6ca40 Merge "Set metered bit for passpoint networkSuggesiton" into rvc-dev 2020-03-19 17:16:09 +00:00