1962 Commits

Author SHA1 Message Date
Rebecca Silberstein
1e96a0968b Merge "Merge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe54661 am: 2dda9f5d66" into oc-dev-plus-aosp
am: a7cba48907

Change-Id: Id27920b3012adde075cfc270b14b5378037913c0
2017-04-17 17:50:44 +00:00
Rebecca Silberstein
3c29ff8835 Merge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe54661
am: 2dda9f5d66

Change-Id: Ie2476bbae3554bd9fc203c478d25cb2e2898c8e3
2017-04-17 17:39:55 +00:00
Rebecca Silberstein
52b665eba0 WifiManager: add new methods to start softap
Add two new methods to start/stop softap in WifiService.  These are
internal calls that allow WifiService and ConnectivityService to
coordinate the switch to and from softap mode.  These calls will not be
callable by apps and are protected by the NETWORK_STACK permission.  The
calls are added in this CL, but are not used at this time.

Bug: 36540346
Test: compiles

Change-Id: Idabdba7f779cbac999ff88d8993b2f4b1f4a1624
2017-04-13 00:43:19 -07:00
Narayan Kamath
492e9e851c Properly guard access to CloseGuard in finalizers.
CloseGuard instances are allocated in constructors and usually
assigned to final fields. This implies they're non-null in finalizers
except in the case where the constructor throws. We add a null check
to make sure we can continue cleaning up other state in the finalizer
(if applicable).

Also, this change decouples closeguard warnings in constructors
from other state based logic. This because the logic there is usually
duplicated with the call to close().

NOTE: This change is not a "complete" fix. Many of these finalizers
are broken in the case where <init> throws. The only objective of
this change is to make such errors more obvious.

Note that some of these classes don't have CTS tests.

Test: make, CtsMediaTestCases.
Bug: 35609098

Change-Id: I24d9e0215f80e44914dba8ab99b6312fd6ed1fc0
2017-04-03 18:12:04 +01:00
Dan Shi
1fee398b88 Change test type from InstrumentationTest to AndroidJUnitTest
Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test

Change-Id: Ic3c4c7a9d29ef9d32a407f31cfc93c5e43650297
2017-03-31 16:02:33 -07:00
Sohani Rao
04f5cb8041 Merge "Introduce Authentication Failure reason codes" am: e23b2c6c59 am: 1fc10c0729
am: 6583d9860e

Change-Id: I9d87bf1724afeeedb92b179dffb7f0be8015160b
2017-03-31 02:00:55 +00:00
Sohani Rao
1fc10c0729 Merge "Introduce Authentication Failure reason codes"
am: e23b2c6c59

Change-Id: I5e002f4b341f2a295ed6d8a2213bc9401fcde008
2017-03-31 01:51:30 +00:00
Treehugger Robot
e23b2c6c59 Merge "Introduce Authentication Failure reason codes" 2017-03-31 01:43:52 +00:00
Sohani Rao
4352b9988d Introduce Authentication Failure reason codes
In order to differentiate between various reasons for authentication
failure, add reason codes. These will be hidden since we don't intend to
have API change.

Bug: 33245941
Test: Unit test
Change-Id: I7222520df18e54d684ba9e50ff95be5d46a7d70c
2017-03-30 16:19:56 -07:00
Michael Plass
70b93740c2 Merge "Remove implementation of bssid hotlist" am: 62c5f64fa5 am: 37a1d983fe
am: 7b4d1bbacc

Change-Id: I1cc13641f08367784c772a08ec5aeffba08ea207
2017-03-30 00:14:00 +00:00
Michael Plass
37a1d983fe Merge "Remove implementation of bssid hotlist"
am: 62c5f64fa5

Change-Id: I3744706b984da6ed123a4eea08312c75806adb8f
2017-03-29 23:57:32 +00:00
Michael Plass
31225c466e Remove implementation of bssid hotlist
Test: Relevant unit tests pass
Bug: 30147676
Change-Id: I268907cc13ef21c0ba547722fe7c866ee4cdae5a
2017-03-29 14:19:50 -07:00
Peter Qiu
fc1529783a Merge "wifi: document UnsupportedOperationException for Passpoint related APIs" into oc-dev
am: ef4b501c6d

Change-Id: I98889dda85de076a8ae326784699475a0571359e
2017-03-29 19:39:32 +00:00
Peter Qiu
856a66a4b3 Merge "wifi: update passpoint to Passpoint in comments" into oc-dev
am: 10180bb47b

Change-Id: Id54111d31f2ffa6937b1d10010f0ca49c86c4a7e
2017-03-29 19:38:30 +00:00
TreeHugger Robot
ef4b501c6d Merge "wifi: document UnsupportedOperationException for Passpoint related APIs" into oc-dev 2017-03-29 19:34:09 +00:00
TreeHugger Robot
10180bb47b Merge "wifi: update passpoint to Passpoint in comments" into oc-dev 2017-03-29 19:31:42 +00:00
Peter Qiu
6bbc8955c1 wifi: update passpoint to Passpoint in comments
Per API Council, we should use the trademark name Passpoint
instead of passpoint in the code comments.

Bug: 35854283
Test: make -j32
Change-Id: Iea6697191a936d1d779c0ea50cd19c134bc7df02
2017-03-29 10:29:21 -07:00
Peter Qiu
1fe2a8cfa6 wifi: document UnsupportedOperationException for Passpoint related APIs
An UnsupportedOperationException will be thrown for Passpoint related
API calls if Passpoint is not enabled on the device (build config
config_wifi_hotspot2_enabled is set to false).

Bug: None
Test: None
Change-Id: Id0ba1f7b80091d55a839fa3eee36baf9b45b7f5f
2017-03-29 10:20:21 -07:00
Etan Cohen
b36a9e0eb5 Merge "[AWARE] Remove Publish/Subscribe Count configuration" am: 5d81b9d67d am: 9bc8e05da2
am: 342a27e7f7

Change-Id: I5b4d9ea932373e8dd82e846d2c31995b23329fff
2017-03-29 17:19:50 +00:00
Etan Cohen
9bc8e05da2 Merge "[AWARE] Remove Publish/Subscribe Count configuration"
am: 5d81b9d67d

Change-Id: I6f7545c6665d4381cdeed03290cf928bc21aef17
2017-03-29 17:08:51 +00:00
Etan Cohen
b51c04effb Merge "[AWARE] Fix unit tests" am: de8e09409b am: c24d7f781a
am: 7060ae081b

Change-Id: I7e90e4c0853457fa49335a48b20d74c3afb9ba1b
2017-03-29 15:14:30 +00:00
Etan Cohen
a85dcbbd8e [AWARE] Fix unit tests
Update to reflect new mockito semantics.

No functional change, no change to test semantics!

(cherry-pick of commit afddcc3c9860fecfdb3ed72fafb09d73e8549411)

Bug: 36680830
Test: unit tests now passing
Merged-In: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
Change-Id: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
2017-03-29 08:07:22 -07:00
Etan Cohen
c24d7f781a Merge "[AWARE] Fix unit tests"
am: de8e09409b

Change-Id: I563dc61839664a7b51c1fe44283f7dd18217b012
2017-03-29 15:04:28 +00:00
Etan Cohen
2cbaf22bba [AWARE] Remove Publish/Subscribe Count configuration
Simplify API: semantics of publish/subscribe count restrictions
aren't clear at the app level. They depend on DW configuration as
well as discovery session type - number of packets transmitted over
the air.

There's already an app-facing discovery session lifetime configuration -
the TTL. That has clearer semantics and is sufficient (for now).

Bug: 36446307
Test: unit tests and integration (sl4a) tests.
Change-Id: I9129975bd2e1a61b3d23a4b6acaae703b42216c7
2017-03-28 11:25:21 -07:00
Etan Cohen
afddcc3c98 [AWARE] Fix unit tests
Update to reflect new mockito semantics.

No functional change, no change to test semantics!

Bug: 36680830
Test: unit tests now passing
Change-Id: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
2017-03-28 10:50:41 -07:00
Roshan Pius
eb4027397b WifiManager(aidl): Remove pingSupplicant binder call
This is now deprecated in the public API and instead calls
isWifiEnabled(). So, remove this AIDL call.

Bug: 36493092
Test: Compiles
Change-Id: I6339d5bb18f423d84fa9222a87e2df7eb9c336a9
Merged-In: I6339d5bb18f423d84fa9222a87e2df7eb9c336a9
2017-03-28 10:11:22 -07:00
Roshan Pius
3d981130f4 Merge "WifiManager(aidl): Remove pingSupplicant binder call" am: 3777874320 am: 673de5b39d
am: d0919ba9c4

Change-Id: Ia955905826f7b7a2219086121212f4498ca92993
2017-03-28 07:58:32 +00:00
Roshan Pius
673de5b39d Merge "WifiManager(aidl): Remove pingSupplicant binder call"
am: 3777874320

Change-Id: Ia12b132ecb8bb8d7effe7b6fa98461c5cbfddf30
2017-03-28 05:34:27 +00:00
Roshan Pius
3777874320 Merge "WifiManager(aidl): Remove pingSupplicant binder call" 2017-03-28 05:25:25 +00:00
Amin Shaikh
e50a607a35 Update hidden WifiManager API.
- Refactor getWpsNfcConfigurationToken(int) to getCurrentNetworkWpsNfcConfigurationToken()

Bug: 35725168
Test: runtest frameworks-wifi
Change-Id: Ia362e4d781297d7f89a4437a0c5ae6edecff24e5
2017-03-23 18:50:01 -07:00
Peter Qiu
424c8c1716 Merge "Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am: 44ef19d131 am: aadbb2d45e" into nyc-mr2-dev-plus-aosp
am: 3f57a273d2

Change-Id: Ie314289ce69f07c872c7a16ddc90d36be25c777f
2017-03-23 23:13:32 +00:00
Peter Qiu
aadbb2d45e Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"
am: 44ef19d131

Change-Id: I65b22e41ae62172cc7b241fe68c6d1c92c782a69
2017-03-23 23:00:06 +00:00
Treehugger Robot
44ef19d131 Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" 2017-03-23 22:53:46 +00:00
Peter Qiu
cf08edf4ff Merge "hotspot2: ignore uninterested headers and content type attributes" am: 7a7bb444cb am: 10d1deff83
am: f9de6d77bc

Change-Id: I735caa47dc93f98e4ef0be7fb5f0fe700dffa1bf
2017-03-23 20:18:41 +00:00
Peter Qiu
10d1deff83 Merge "hotspot2: ignore uninterested headers and content type attributes"
am: 7a7bb444cb

Change-Id: Ic97238b1400e8da514612f983db1896011bf775f
2017-03-23 20:06:12 +00:00
Peter Qiu
ed1fc64efd wifi: use android.graphics.drawable.Icon for Passpoint icon data
Bug: 35857805
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ib076cd7f565638613173c7373ea5ea61affb876d
2017-03-23 11:42:49 -07:00
Peter Qiu
5a493241d9 hotspot2: ignore uninterested headers and content type attributes
Each vendor might put additional headers and content type attributes
in the installation file, and will not be useful for us.  So just
ignore them when parsing the installation file instead of error out.

While there, add support for parsing "Extension" node in PpsMoParser.
This an interior node containing vendor specific information, only
meaningful to the vendor.  So we will ignore fields under this node.

Bug: 36477333
Test: frameworks/base/wifi/tests/runtests.sh
Test: manual test by installing ruckus Passpoint profile
Change-Id: I9954ed000387bc8048d0452a5bfb0f339e676659
2017-03-23 11:40:05 -07:00
Dan Shi
874a0916fc Merge "Add test configs to apct tests under frameworks/base" 2017-03-22 17:55:58 +00:00
Roshan Pius
1abdd50ee3 WifiManager(aidl): Remove pingSupplicant binder call
This is now deprecated in the public API and instead calls
isWifiEnabled(). So, remove this AIDL call.

Bug: 36493092
Test: Compiles
Change-Id: I6339d5bb18f423d84fa9222a87e2df7eb9c336a9
2017-03-22 01:44:44 +00:00
Dan Shi
7f2afd2dff Add test configs to apct tests under frameworks/base
TouchLatency is needed by test TouchLatencyJankTestWear
UiBench is needed by test UiBenchJankTests

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
make -j32 TouchLatency TouchLatencyJankTestWear  && \
tradefed.sh run template/local --template:map test=TouchLatencyJankTestWear \
      --test-tag testname --log-level-display VERBOSE
make -j32 UiBenchJankTests UiBench  && \
tradefed.sh run template/local --template:map test=UiBenchJankTests \
      --test-tag testname --log-level-display VERBOSE

Change-Id: I63f23e3a21ad1343607953958fb7bb0a5fb8c343
2017-03-21 00:05:14 -07:00
Peter Qiu
98595e7718 Merge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b am: 8951172562
am: 79ff52975f

Change-Id: I80cdbc7f0140e6085c06cab8eaba63e1fc455538
2017-03-17 22:23:30 +00:00
Peter Qiu
8951172562 Merge "hotspot2: implement toString for PasspointConfiguration"
am: 5bd337397b

Change-Id: I8db5f02e6c6ab6b03de5ae3cff39619f85963e9b
2017-03-17 22:08:21 +00:00
Treehugger Robot
5bd337397b Merge "hotspot2: implement toString for PasspointConfiguration" 2017-03-17 21:57:16 +00:00
Peter Qiu
89537734e1 hotspot2: implement toString for PasspointConfiguration
Bug: 35850988
Test: Verify contents in "adb shell dumpsys"
Change-Id: Idabe65d505eb15113aba06dc05c879861b94b2af
2017-03-17 12:44:13 -07:00
Roshan Pius
da34226f06 Merge "WifiConfiguration: Correct documentation for priority"
am: f5fa26bf25

Change-Id: I37fd50fac3dc6c2db8c677d1a265fca73babf5da
2017-03-17 17:28:13 +00:00
Roshan Pius
6b6f1b9e12 Merge "WifiConfiguration: Update psk documentation"
am: 89c79ff632

Change-Id: I3ac1ed89de58038cf7bcddcac7b090fc07a8e4b8
2017-03-17 17:26:57 +00:00
Roshan Pius
651b264b3d WifiConfiguration: Correct documentation for priority
Addressing the concerns raised by API council for deprecating this
field.

Bug: 35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc
2017-03-17 08:44:06 -07:00
Roshan Pius
cbd0c76ad0 WifiConfiguration: Update psk documentation
Adding some documentation to explain the expected contents of this
field.

Bug: 35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
2017-03-17 08:40:17 -07:00
TreeHugger Robot
77724a5be7 Merge "WifiConfiguration: Correct documentation for priority" 2017-03-17 04:06:52 +00:00
Roshan Pius
60d9c84209 Merge "WifiConfiguration: Update psk documentation" 2017-03-17 03:59:40 +00:00