Android Build Merger (Role)
839c0ed22d
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975
...
Change-Id: I57936e6a45df8f40d3d1aa7a72d57ea40e9b5909
2018-02-02 18:16:35 +00:00
Android Build Merger (Role)
e016e9c975
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59
...
Change-Id: I74d9fbe30fd93e43cfa9d5b3d7eae64418163924
2018-02-02 18:16:30 +00:00
Android Build Merger (Role)
d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766
...
Change-Id: I15d12616e80cfd1b4d03a76ef1030fa2003a83d2
2018-02-02 18:16:25 +00:00
Android Build Merger (Role)
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8
...
Change-Id: I5a6d8519fc77c96d2df7afc58c1d45af57250e8b
2018-02-02 18:16:12 +00:00
Android Build Merger (Role)
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
...
Change-Id: I46bbee504ea7a64d39b98a2a8336b3bcf593869a
2018-02-02 18:15:53 +00:00
Etan Cohen
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
...
ParcelableRttResults was unparceled incorrectly.
Bug: 70398564
Test: exploit provided in bug no longer works
Change-Id: Ifd6de547e9861bbebc399b43d0cc2899a8160813
2018-02-02 10:11:47 -08:00
David Farrow
b1e3d9ab26
Merge "documentation fixes" into nyc-mr1-dev
...
am: 14826e5489
2017-04-27 17:09:26 +00:00
David Farrow
d4b072159d
documentation fixes
...
This only affects documentation; no code has been changed.
Added missing whitespace and closing parens, hid a fixme note.
Bug: 35925288
Fixes: 35925288
Change-Id: I1a0d243fbe1e3f7f31e6249ab3941b67771ca7b8
2017-03-02 22:34:31 +00:00
Svetoslav Ganov
82737b42a6
Add WiFi toggle prompts - framework
...
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:28715749
Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
2016-12-05 13:52:05 +00:00
Mitchell Wills
4bfb391c91
Add a flag to indicate if a ScanData is for a scan for all channels
...
BUG=30897947
Change-Id: I919d7fa9c3bf196371e506d23e393a9d609a5b4b
2016-09-06 15:08:36 -07:00
Paul Stewart
0e164b199e
Document correct context for obtaining WifiManager
...
Added comments to both WifiManager WIFI_SERVICE.
Bug: 25015174
Change-Id: Ibd1e21d860ef2b7cc432b3da76671d22c02ef7cb
2016-08-26 09:27:04 -07:00
Randy Pan
7d82f98b8f
Deprecate QNS network disable reason BAD_LINK
...
WifiNetworkAgent#unwanted no longer disables the network.
Bug: 28558417
Change-Id: I2e7ed99ae4cb952f124c673376d967eeee2b4ece
2016-07-28 10:14:31 -07:00
Paul Stewart
b3ff6b4437
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994
...
am: f8d4c187a3
2016-07-20 01:19:46 +00:00
Paul Stewart
f8d4c187a3
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772
...
am: 6245774994
2016-07-20 01:12:11 +00:00
Paul Stewart
c77f18b2a3
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6
...
am: d78a14531e
2016-07-20 01:11:49 +00:00
Paul Stewart
d78a14531e
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee
...
am: 701a6c1ed6
2016-07-20 01:01:15 +00:00
Paul Stewart
6245774994
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d
...
am: 5d60d2f772
2016-07-20 00:54:27 +00:00
Paul Stewart
701a6c1ed6
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4
...
am: e41e0064ee
2016-07-20 00:54:20 +00:00
Paul Stewart
700c72d01d
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4
...
am: bf4f010a5b
2016-07-20 00:37:50 +00:00
Paul Stewart
e2a03026c4
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9
...
am: 141477b103
2016-07-20 00:37:44 +00:00
Paul Stewart
bf4f010a5b
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf
...
am: 3fbe9280a4
2016-07-20 00:31:22 +00:00
Paul Stewart
141477b103
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6
...
am: df93deccf9
2016-07-20 00:31:15 +00:00
Paul Stewart
3fbe9280a4
Fix string equality comparison am: 1033c6fdbc
...
am: fdd4fe53cf
2016-07-20 00:25:17 +00:00
Paul Stewart
df93deccf9
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646
...
am: fa4bbf4ad6
2016-07-20 00:25:14 +00:00
Paul Stewart
1033c6fdbc
Fix string equality comparison
...
Don't use "==" to compare strings.
Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
2016-06-30 11:58:38 -07:00
Paul Stewart
cc00f4d646
WifiEnterpriseConfiguration: Do not print credentials in toString
...
BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
2016-06-30 11:57:20 -07:00
Rebecca Silberstein
b7d13d53bf
DO NOT MERGE WifiManager: add WIFI_MODE_NO_LOCKS_HELD
...
(cherry-pick from master)
Add a WifiLock mode representing that no locks are held (@hide).
Bug: 28669096
Change-Id: I774d5ff226e7c639812f9735555c8ea1ed6444af
Test: compiles and runtest frameworks-wifi
2016-06-28 15:53:46 -07:00
Mitchell Wills
9f750bf5f4
Merge "Add a WifiScanner API to listener for ongoing scans" into nyc-mr1-dev
2016-06-27 18:12:41 +00:00
Mitchell Wills
015c8a3ac0
Merge "Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime" into nyc-mr1-dev
2016-06-24 20:24:13 +00:00
Mitchell Wills
a464a9fce8
Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime
...
wpa_supplicant can update this value when authenticating so if the
framework writes it back the new value can be overwritten.
TEST: Patch was validated by original reporter
Enterprise tests pass (b/29608435)
Change-Id: If359b4ca625371fbdb68177c7cdb6498c3a519a1
Fixes: 28161335
2016-06-24 13:17:31 -07:00
Mitchell Wills
0a726ac690
Add a WifiScanner API to listener for ongoing scans
...
Bug: 29412469
Change-Id: Id884851a12f95c89f928b81f5b5baa1f9f80fafe
2016-06-23 14:38:59 -07:00
daisuke niwa
af1eafd7b1
Fix invitation request from persistent GC
...
When the device received the second invitation request
from GC of the same PersistentGroup, the wifi framework
processes "sa" as mOwner of WifiP2pGroup. At this point,
if an invited group is persistent group, WifiP2pGroup can't
know whether "sa" is GC or GO yet. So the framework shouldn't
process mOwner in the constructor.
Bug: 28715251
Change-Id: Ie7065da0d6c978c3747ecbd6f728de87d9567009
2016-06-20 08:51:50 -07:00
Gina Dimino
98ad88811c
Docs: Suppress errors in SystemApi Build
...
Bug: 28427390
Change-Id: Ifea85bf7b1fcdd30a3d7f61bd17d0efba6368aa4
2016-06-01 16:13:53 -07:00
Adam Lesinski
0d47f4b646
Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
2016-04-18 23:27:10 +00:00
Wei Wang
f49b51e000
Merge "Use ConnectivityThread for RttManager." into nyc-dev
2016-04-18 21:17:25 +00:00
Adam Lesinski
010bf374d8
BatteryStats: Introduce Async external stats requests
...
Instead of calling out to external processes with a blocking IPC,
pass along a Binder on which the external process can pass back
the response. The calling process can then wait for the reply with
a timeout.
This eliminates watchdog restarts of the system_server when an external
process like telephony or bluetooth hangs.
Bug:26842468
Change-Id: I1b242e4ed22a63f1a4a0be8c78de8ac4d7bf56c5
2016-04-15 15:27:52 -07:00
Jeremy Joslin
e9f5cd3784
Merge "Added useExternalScores field to WifiConfiguration." into nyc-dev
2016-04-15 20:14:03 +00:00
Steve Malkos
53afdf2935
Merge "Expose RTT capability APIs for secure RTT." into nyc-dev
2016-04-15 20:03:22 +00:00
Wei Wang
bd3353a6c4
Use ConnectivityThread for RttManager.
...
Bug:27432949
Change-Id: I80fc02ff78981ca4798844c4d869b0eb60fbd84b
2016-04-15 12:45:34 -07:00
Jeremy Joslin
fc8601310d
Added useExternalScores field to WifiConfiguration.
...
Bug: 25562019
Change-Id: Ie3b02875b74f6decb1d4be0107a5a8161f66d657
2016-04-15 09:10:46 -07:00
Wei Wang
cae1be2200
Expose RTT capability APIs for secure RTT.
...
Bug: 28199253
Change-Id: I790b72a365f788ef225566e7fc13b3e097f346b2
2016-04-14 15:47:42 -07:00
Mitchell Wills
0ed524dee8
Connect WifiScanner synchronously without sync barrier
...
This allows the WifiScanner constructor to be called from the Looper
that is associated with the provided handler instead of relying on the
provided looper to execute initialization async.
Bug: 27695292
Change-Id: Id30dbb8d181971035a0b3f76dd485875e9d03ca3
2016-04-14 15:27:44 -07:00
Jan Nordqvist
82f3053476
Merge "Fixed incomplete OSEN config code." into nyc-dev
2016-04-14 00:21:42 +00:00
Mitchell Wills
3c5870912b
Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev
2016-04-13 18:41:55 +00:00
Mitchell Wills
91312c7cb2
Make WifiScanner state not static and use ConnectivityThread
...
Bug: 27432949
Change-Id: I3fa14b75ee6a48aea2bfb8fed662c37b678e3cf0
2016-04-12 20:59:24 +00:00
Samuel Tan
44a4668b45
Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()
...
This renaming better reflects how this method is a setter, and
supports variable renaming taking place in WifiConfigManager and
WifiStateMachine.
BUG: 28088867
Change-Id: Ic2f7a1f53ffec4072e556d2831bfdcff9fef1ad7
TEST: 'runtest frameworks-wifi' passes.
2016-04-08 12:50:23 -07:00
Roshan Pius
5a4027e26c
Merge "WifiScanner: Remove pnosetting stopPno API (1/2)" into nyc-dev
2016-04-07 19:28:24 +00:00
Roshan Pius
37aeb4700b
WifiScanner: Remove pnosetting stopPno API (1/2)
...
BUG: 27532350
Change-Id: I6df3df56e66c7bbb8443c038cd8345989cf2d57e
2016-04-07 10:32:24 -07:00
Randy Pan
429b9fcb7b
Merge "Enable/disable WifiConnectivityManager at runtime" into nyc-dev
2016-04-07 17:22:49 +00:00
Rubin Xu
f5c0a55d1e
Fix wrong condition
...
am: 492ed58
2016-04-07 15:00:59 +00:00
