Commit Graph

2830 Commits

Author SHA1 Message Date
Hai Shalom
f8a5719cfc Merge "Revert submission" into qt-qpr1-dev
am: 65c9665125

Change-Id: Id444c3a9c767de5144ee2ded8f4c1cabca304670
2019-11-21 19:57:39 -08:00
Hai Shalom
65c9665125 Merge "Revert submission" into qt-qpr1-dev 2019-11-22 03:46:01 +00:00
Hai Shalom
a4284cb292 Revert submission
Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.

Change-Id: I383273509797ed95a7f9ece780ec52abb1341292
Merged-In: Iff36d5a10e6c8ee8978a5842af8f19efc10c0a91
2019-11-21 23:08:43 +00:00
David Su
02076c7a01 Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID" am: 1124e240c0
am: c4df6668bb

Change-Id: I6e50821d3fdd5e6ff5fc4cd238ccd186dd1ff94c
2019-11-21 11:58:10 -08:00
David Su
1124e240c0 Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID" 2019-11-21 18:44:46 +00:00
David Su
e51ae1566b NetworkKey: migrate from ScanResult.wifiSsid to SSID
wifiSsid is an @hide field, migrate to getter method.

Bug: 144311098
Test: atest NetworkKeyTest
Change-Id: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
Merged-In: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
2019-11-20 10:41:59 -08:00
James Mattis
ed6fe63662 Merge "Swap param order in registerSoftApCallback" am: 1dcfd69218
am: fa968e9691

Change-Id: I0efdc1f3fd35fe059747b6ba2c6b0dc1731b3388
2019-11-20 10:40:05 -08:00
James Mattis
4a3e2c1e93 Swap param order in registerSoftApCallback
Moving executor to be the first argument in registerSoftApCallback.

Bug: 144379300
Test: atest FrameworksWifiApiTests:android.net.wifi.WifiManagerTest
Manually on pixel 3

Change-Id: I7074278d16beac422ce7b29d4471b2794fa97825
Merged-In: I7074278d16beac422ce7b29d4471b2794fa97825
2019-11-18 13:48:29 -08:00
Hai Shalom
19d6971364 Merge "[WPA3] Fix WPA3-Personal transition mode" into qt-qpr1-dev
am: 78ee3320ff

Change-Id: I52bdc08f8d6efd0f4ab6f618b2edae3f40ddc271
2019-11-18 13:46:51 -08:00
Hai Shalom
78ee3320ff Merge "[WPA3] Fix WPA3-Personal transition mode" into qt-qpr1-dev 2019-11-18 21:29:39 +00:00
Hai Shalom
8000abd65b [WPA3] Fix WPA3-Personal transition mode
Fix WPA3-Personal in transition mode issues. Current
solution will create an upgraded WPA3 connection if
there is a WPA2 saved network and AP is in transition
mode.

Bug: 143843364
Test: Manual tests
Test: atest com.android.server.wifi
Change-Id: Idadbd1d155ddd617e61063e64e186abec478f5ff
Merged-In: I53b278e846828198fb1953b075d86e16fac6d795
2019-11-16 01:43:30 +00:00
James Mattis
49960bdd5f Merge "Marking SoftApCallback methods as SystemAPI" am: 8295ffc5af
am: 179ed7d640

Change-Id: I0498bdefc05aad2b56c68f586e480d06b9fe80c1
2019-11-15 15:43:44 -08:00
James Mattis
190e1cacde Marking SoftApCallback methods as SystemAPI
Making SoftApCallback methods available to @SystemAPI including
the API for registration of a SoftApCallback. This includes updating
registration to use an executor now vs a handler.

Bug: 143564153
Test: atest FrameworksWifiApiTests:android.net.wifi.WifiManagerTest
Also tested manually on a Pixel 3.

Change-Id: I22b5029a8dbd7a50ad6faf0bb3b15269af839956
Merged-In: I22b5029a8dbd7a50ad6faf0bb3b15269af839956
2019-11-14 10:48:33 -08:00
James Mattis
955c650a74 Merge "Support for hotspot client visibility." am: 81200971e1
am: 6f1bf857a6

Change-Id: Ie0b8b3f4ab168f132f4f6cc01df525c69c8cde41
2019-11-13 08:58:28 -08:00
Nate(Qiang) Jiang
d76f407953 Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev
am: e3ff000ca5

Change-Id: I3666a418a1987116736aa7c86113de7dc15bd8f7
2019-11-12 15:11:59 -08:00
Nate(Qiang) Jiang
6d0eef4d2c [WifiAware] fix creator from parcel
creator should read all content from parcel before verify available

Bug: 144286370
Test: atest android.net.wifi
Change-Id: Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3
Merged-In: Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3
2019-11-12 11:36:33 -08:00
James Mattis
201a319860 Support for hotspot client visibility.
Adding support for visibility into clients that connect to an active hotspot.

Bug: 137309578
Test: atest FrameworksNetTests:com.android.server.connectivity.TetheringTest
atest FrameworksWifiApiTests:android.net.wifi.WifiManagerTest
atest FrameworksWifiApiTests:android.net.wifi.WifiClientTest
Tested manually on Pixel 3.

Change-Id: I1caeb10bc50202873e760a76b346bccd941e2574
Merged-In: I1caeb10bc50202873e760a76b346bccd941e2574
2019-11-11 22:10:35 -08:00
TreeHugger Robot
c73945bd84 Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot." into qt-qpr1-dev 2019-11-08 06:11:19 +00:00
Yury Kotlyarov
166f256958 Fix LocalOnlyHotspotReservation double stop of local hotspot.
If user executed startLocalOnlyHotspot(), then reservation.close()
garbage collector still keeps reservation object until drain.
If user executed startLocalOnlyHotspot second time during
application life cycle, garbage collector can delete previously
allocated reservation object. In this case finalize() of old
reservation object will be executed, then close(), then
stopLocalOnlyHotspot(). As result, new started LocalOnlyHostpot
can be immediatly stopped by old reservation object delete.
Steps to reproduce: execute startLocalOnlyHostpot() and
reservation.close() multiple times during application life cycle,
check if hotspot up couple of seconds after start.
This fix prevents stopping of local hotspot if reservation
was previously closed.
Test: manual

Bug: 139074896
Bug: 143653311

Change-Id: I86c10b577dbab8cad2d5f7e19805511a93bcb668
Merged-In: I86c10b577dbab8cad2d5f7e19805511a93bcb668
(cherry-picked from ee7b0a6ab2)
2019-11-07 05:44:36 +00:00
Chen Xu
3157fcdfd8 Merge "new telephony annotation class" am: 386027afdd
am: 54aba99636

Change-Id: I558883c7fb94b9685da5f5c570d2d331a19ba6d5
2019-11-05 01:15:59 -08:00
David Su
0b903dbc0f Merge changes from topic "tethering-systemapi" am: 8e34d95a22
am: 613e7abaa2

Change-Id: Ica224970dc296b82fb68e3e2b25dcb4e525d6b75
2019-11-04 16:36:29 -08:00
Chen Xu
386027afdd Merge "new telephony annotation class" 2019-11-04 23:29:39 +00:00
Chen Xu
7631ff7c48 new telephony annotation class
This is a preparatory work for mainline. since Intdef is hidden, so we
have to move some annotations (applied in SDK/system API) to a separate
annotation class and having other module statically link to it.

TODO: include telephony annotation in framework-non-updatable-sources

Bug: 140908357
Test: Build
Change-Id: I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1
(cherry picked from commit c9d4ee112e)
Merged-in: I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1
(cherry picked from commit 4712711d3d91621083bf92f5a1647b92c20a8b81)
2019-11-04 21:26:50 +00:00
David Su
1cef853e2d Clarify JavaDoc for SoftAP APIs
Add more documentation to WifiManager's
EXTRA_WIFI_AP_INTERFACE_NAME, EXTRA_WIFI_AP_MODE,
and startSoftAp().

Bug: 143138160
Test: compiles
Change-Id: I15a22ca8d0718e02e606ba6e19d20b1727aa93d2
Merged-In: I15a22ca8d0718e02e606ba6e19d20b1727aa93d2
2019-11-01 20:26:09 -07:00
David Su
562f07e9ed Promote @hide APIs to @SystemApi for tethering
Bug: 142372871
Test: compiles
Change-Id: I91f143cdc23c6dce8921931a591298ee0c1a1c00
Merged-In: I91f143cdc23c6dce8921931a591298ee0c1a1c00
2019-11-01 20:25:57 -07:00
Sunil Ravi
cd084d5ce8 Merge "wifi: Change WIFI_FEATURE_XXX type from int to long" into qt-qpr1-dev
am: 0710a7e6de

Change-Id: I62aabcf014bc069353619dc98ed65cea7eb4fe09
2019-10-30 10:37:16 -07:00
Sunil Ravi
ce5cf6225f wifi: Change WIFI_FEATURE_XXX type from int to long
This change is to avoid issues in assigning signed integer
feature (WIFI_FEATURE_DPP) to long featureSet. The
assignement was resulting in large, signed integer.

Bug: 143363031
Test: atest com.android.wifi.server
Test: Wifi ON/OFF, Connect and data transfer
Test: Added logs and verified feature set saved in iface.
Change-Id: Ic3828e675e49a8c1628368a7e6cf7f01e420bd96
(cherry picked from commit 26ac48bcd7)
2019-10-29 17:48:55 +00:00
Roshan Pius
d5624efa48 Merge "WifiManager: Reword documenation for get/remove passpoint API" into qt-qpr1-dev
am: 450c63e992

Change-Id: I6338d209186dc74eef168cecfb31d79aebfdfb6a
2019-10-10 10:15:48 -07:00
Roshan Pius
6dcadfa41a WifiManager: Reword documenation for get/remove passpoint API
Bug: 141639265
Test: Compiles
Change-Id: If44ec91ca2d8a4a409677cd7f0f936972db719f6
2019-10-09 11:26:11 -07:00
Xin Li
d57e959e71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Aurimas Liutikas
de0ebb082e Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be
am: ed5beec21b

Change-Id: I202951d51820be47b9195734601830553215bdd7
2019-08-30 08:43:01 -07:00
Aurimas Liutikas
ed5beec21b Merge "Add missing nullability annotations." into stage-aosp-master
am: 85c0a5a2be

Change-Id: Ic9ea2b9840fbb678bbb6ab77038415581feba918
2019-08-30 08:35:52 -07:00
Aurimas Liutikas
00be951a08 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:14:44 +00:00
Roshan Pius
d0ba20f11b Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot." am: c046f9f039 am: aa562f6dc3
am: 48f566d5a9

Change-Id: I433b62544603f3298a6f7314e982c56a78bb0171
2019-08-27 10:56:35 -07:00
Roshan Pius
48f566d5a9 Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot." am: c046f9f039
am: aa562f6dc3

Change-Id: I2aca4f234b70a1ec49f459ef2ae58ec52126cb78
2019-08-27 10:31:48 -07:00
Roshan Pius
aa562f6dc3 Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot."
am: c046f9f039

Change-Id: I362b05f32fc26a7233bd4dd26b3e941c8d2e9a46
2019-08-27 10:19:55 -07:00
Roy Want
2d2b916cd3 Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)
Bug: 139448024
Bug: 139448573
Test: All tests pass (with increased precision), end-to-end tests pass.
Change-Id: I1e1dd3b26df707279e6cc2d59951f28d7878efe8
2019-08-16 21:11:21 +00:00
Yury Kotlyarov
ee7b0a6ab2 Fix LocalOnlyHotspotReservation double stop of local hotspot.
If user executed startLocalOnlyHotspot(), then reservation.close()
garbage collector still keeps reservation object until drain.
If user executed startLocalOnlyHotspot second time during
application life cycle, garbage collector can delete previously
allocated reservation object. In this case finalize() of old
reservation object will be executed, then close(), then
stopLocalOnlyHotspot(). As result, new started LocalOnlyHostpot
can be immediatly stopped by old reservation object delete.
Steps to reproduce: execute startLocalOnlyHostpot() and
reservation.close() multiple times during application life cycle,
check if hotspot up couple of seconds after start.
This fix prevents stopping of local hotspot if reservation
was previously closed.
Test: manual

Bug: 139074896
Change-Id: I86c10b577dbab8cad2d5f7e19805511a93bcb668
2019-08-07 16:05:54 -05:00
Steven Liu
47af13c805 Add the defination of Intent - WIFI_NETWORK_SETTINGS_RESET_ACTION
Bug: 135489675
Test: Do 'reset settings', registered app got the Intent.
Change-Id: I39adae63269595edda79aaf3da82a3dfe613d59a
2019-07-24 09:52:47 -07:00
TreeHugger Robot
4bdeefacba Merge "p2p: update documents about EXTRA_WIFI_P2P_GROUP in connection changed event" into qt-dev 2019-07-18 18:11:23 +00:00
Jimmy Chen
036b140b39 p2p: update documents about EXTRA_WIFI_P2P_GROUP in connection changed event
This value may be a null, receiver should check before using variable.

Bug: 137618950
Test: make docs
Change-Id: If466dac092fc345482d0456f08a915d1e7ba0010
2019-07-18 14:27:21 +00:00
Nate Jiang
16601cdd99 [AWARE] recommend use Builder create instance in doc
Changes doc for using Builder to create WifiAwareNetworkSpecifier
instead of deprecated Api.

Test: It's a doc change.
Bug: 136034317
Change-Id: I6f41ceae6d696fc5df336ad831c2c89ab3746c50
2019-06-25 17:57:37 -07:00
Hai Shalom
2195d1fc66 [OWE] Support OWE in transition mode
Support OWE in transition mode for devices with OWE support
and devices without OWE support. Scan results will return a
new type of network for OWE in transition networks on devices
that support OWE, and Open for devices that don't support OWE.
Handle the case where Open network is manually added to a device
that supports OWE.

Bug: 132139642
Test: Device with OWE: Connect to Open, OWE-Transition, OWE networks
Test: Device without OWE: Connect to Open, OWE-Transition
Test: Manually create Open network, connect to OWE-Transition
Change-Id: I29e69eaae2672562420ee7c6393bf2cc4d7f1b91
2019-05-13 15:37:43 -07:00
TreeHugger Robot
78f6faf13d Merge "[InformationElementUtil] Add FT/SAE AKM" into qt-dev 2019-05-12 05:43:32 +00:00
Hai Shalom
b6b102f014 [InformationElementUtil] Add FT/SAE AKM
Add FT/SAE AKM to InformationElementUtil class and parse it correctly so
that the phone would be able to associate with APs advertising it.
Added additional unit tests that were missing.

Bug: 132378498
Test: atest InformationElementUtilTest
Change-Id: I470e4e071de36dfe8f79475477c6077ed8bef3cb
2019-05-10 13:44:56 -07:00
Bram Bonné
5853bd038f Documentation update for MAC access restrictions.
With change ag/7340724, the device's P2P MAC adress will only be
available to callers holding the LOCAL_MAC_ADDRESS permission, and will
be anonymized otherwise. This CL updates the documentation in
WifiP2pManager to reflect that.

Bug: 132055766
Test: atest tests/src/android/net/wifi/

Change-Id: I9c2b5ce2cb2c2d2d6766fd34f3451ad4f22a5698
2019-05-07 10:16:20 +00:00
Oscar Shu
0731915380 Merge "Dump randomized MAC in bugreport" into qt-dev 2019-05-03 17:00:40 +00:00
xshu
51ef178ca6 Dump randomized MAC in bugreport
Needed for debug purposes.

Bug: 131850574
Test: unit tests
Test: verified with dumpsys wifi: "mRandomizedMacAddress: 42:03:7d:d0:0e:6c"

Change-Id: Icc3eed999849c58079c298452574f68b96ba7706
2019-05-02 16:24:05 -07:00
Otto Seiskari
a184a4b1da Fix tests/runtests.sh
The location of FrameworksWifiTests.apk installed by the script
with adb seems to have changed. The path of the APK contains the
TARGET_ARCH environment variable, which is now fetched
with a similar method as in system/netd/tests/runtests.sh.

Noticed the issue with "lunch aosp_x86_64-eng". Before this fix,
the test script produced an error:

    adb: failed to stat [...]/FrameworksWifiApiTests.apk:
    No such file or directory

Test: ./frameworks/base/wifi/tests/runtests.sh

Change-Id: Id4a33ca89fa21a9a4ef791c5c1c5760e0e2badaf
Merged-In: Id4a33ca89fa21a9a4ef791c5c1c5760e0e2badaf
Signed-off-by: Otto Seiskari <otto.seiskari@indooratlas.com>
2019-04-26 18:51:33 +00:00
Otto Seiskari
f442263a08 Fix tests/runtests.sh
The location of FrameworksWifiTests.apk installed by the script
with adb seems to have changed. The path of the APK contains the
TARGET_ARCH environment variable, which is now fetched
with a similar method as in system/netd/tests/runtests.sh.

Noticed the issue with "lunch aosp_x86_64-eng". Before this fix,
the test script produced an error:

    adb: failed to stat [...]/FrameworksWifiApiTests.apk:
    No such file or directory

Bug: 128603658
Test: ./frameworks/base/wifi/tests/runtests.sh

Change-Id: Id4a33ca89fa21a9a4ef791c5c1c5760e0e2badaf
Signed-off-by: Otto Seiskari <otto.seiskari@indooratlas.com>
2019-04-26 17:00:05 +00:00