• Home
  • History
  • Annotate
  • only in /frameworks/base/wifi/java/android/net/wifi/
History log of /frameworks/base/wifi/java/android/net/wifi/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
4bfb391c91b3539d2ec20ffd7e01056dafa0984d 07-Sep-2016 Mitchell Wills <mwills@google.com> Add a flag to indicate if a ScanData is for a scan for all channels

BUG=30897947

Change-Id: I919d7fa9c3bf196371e506d23e393a9d609a5b4b
ifiScanner.java
0e164b199ee33dbb1e9feeaa24c52231f9b81ac0 08-Aug-2016 Paul Stewart <pstew@google.com> Document correct context for obtaining WifiManager

Added comments to both WifiManager WIFI_SERVICE.

Bug: 25015174
Change-Id: Ibd1e21d860ef2b7cc432b3da76671d22c02ef7cb
ifiManager.java
7d82f98b8f2d8bd7b46e35599e4994cd6e23c03e 27-Jul-2016 Randy Pan <zpan@google.com> Deprecate QNS network disable reason BAD_LINK

WifiNetworkAgent#unwanted no longer disables the network.

Bug: 28558417
Change-Id: I2e7ed99ae4cb952f124c673376d967eeee2b4ece
ifiConfiguration.java
b7d13d53bf95c86ed3e65277dc072e3379c94f8e 20-May-2016 Rebecca Silberstein <silberst@google.com> 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
ifiManager.java
9f750bf5f468e127c3286b4366751e124e74c3fe 27-Jun-2016 Mitchell Wills <mwills@google.com> Merge "Add a WifiScanner API to listener for ongoing scans" into nyc-mr1-dev
015c8a3ac0d25a85899f433bc9b0af6c3dc849fc 24-Jun-2016 Mitchell Wills <mwills@google.com> Merge "Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime" into nyc-mr1-dev
a464a9fce8d160d2bbac3aeea3b23ecc7bb179a0 17-Jun-2016 Mitchell Wills <mwills@google.com> 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
ifiEnterpriseConfig.java
0a726ac690cf5418257cd7dcb176c71158687561 23-Jun-2016 Mitchell Wills <mwills@google.com> Add a WifiScanner API to listener for ongoing scans

Bug: 29412469
Change-Id: Id884851a12f95c89f928b81f5b5baa1f9f80fafe
ifiScanner.java
af1eafd7b14f4cafd150d01d1d9d87470a4f3777 27-Feb-2015 daisuke niwa <daisuke.x.niwa@sonymobile.com> 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
2p/WifiP2pGroup.java
98ad88811c76f7334c285cc970a4107f7a716b5a 01-Jun-2016 Gina Dimino <gdimino@google.com> Docs: Suppress errors in SystemApi Build
Bug: 28427390

Change-Id: Ifea85bf7b1fcdd30a3d7f61bd17d0efba6368aa4
ttManager.java
ifiScanner.java
0d47f4b6463077074abd6bed489a5f9243615c64 19-Apr-2016 Adam Lesinski <adamlesinski@google.com> Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
f49b51e000af2d17e315294f9584890d5e93fa33 18-Apr-2016 Wei Wang <weiwa@google.com> Merge "Use ConnectivityThread for RttManager." into nyc-dev
010bf374d8145528f8733dfa6ef101b15de23a8d 11-Apr-2016 Adam Lesinski <adamlesinski@google.com> 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
WifiManager.aidl
ifiActivityEnergyInfo.java
e9f5cd3784b0c13c34c40a9bc01dcadb6e7bc8b3 15-Apr-2016 Jeremy Joslin <jjoslin@google.com> Merge "Added useExternalScores field to WifiConfiguration." into nyc-dev
53afdf293538b35bfb57ee6e22953abdeade71e9 15-Apr-2016 Steve Malkos <smalkos@google.com> Merge "Expose RTT capability APIs for secure RTT." into nyc-dev
bd3353a6c41896ed74d53b056ca1aefb2196c979 08-Apr-2016 Wei Wang <weiwa@google.com> Use ConnectivityThread for RttManager.

Bug:27432949

Change-Id: I80fc02ff78981ca4798844c4d869b0eb60fbd84b
ttManager.java
fc8601310d9af6e8ac16a118b16a1ae414e93900 15-Apr-2016 Jeremy Joslin <jjoslin@google.com> Added useExternalScores field to WifiConfiguration.

Bug: 25562019
Change-Id: Ie3b02875b74f6decb1d4be0107a5a8161f66d657
ifiConfiguration.java
cae1be220071ac5e0483eb4f9ea5aca59d9ab733 15-Apr-2016 Wei Wang <weiwa@google.com> Expose RTT capability APIs for secure RTT.

Bug: 28199253
Change-Id: I790b72a365f788ef225566e7fc13b3e097f346b2
ttManager.java
0ed524dee8a22c18f9617a314ac6e65ac1e94380 14-Apr-2016 Mitchell Wills <mwills@google.com> 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
ifiScanner.java
82f3053476c4b206847a7ab951d750fe1fd83b2f 14-Apr-2016 Jan Nordqvist <jannq@google.com> Merge "Fixed incomplete OSEN config code." into nyc-dev
3c5870912b6dc20e13c3af5e078a600b88904e99 13-Apr-2016 Mitchell Wills <mwills@google.com> Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev
91312c7cb2df952424b16dc563bfe455661ceada 07-Apr-2016 Mitchell Wills <mwills@google.com> Make WifiScanner state not static and use ConnectivityThread

Bug: 27432949
Change-Id: I3fa14b75ee6a48aea2bfb8fed662c37b678e3cf0
ifiScanner.java
44a4668b4599a1284f4c2011b1ab4bf90b9b4ab6 07-Apr-2016 Samuel Tan <samueltan@google.com> 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.
WifiManager.aidl
ifiManager.java
5a4027e26ca07b921824757433bfd62481a6a78c 07-Apr-2016 Roshan Pius <rpius@google.com> Merge "WifiScanner: Remove pnosetting stopPno API (1/2)" into nyc-dev
37aeb4700b26bf78491a786108fa5fc86c8bc62f 07-Apr-2016 Roshan Pius <rpius@google.com> WifiScanner: Remove pnosetting stopPno API (1/2)

BUG: 27532350
Change-Id: I6df3df56e66c7bbb8443c038cd8345989cf2d57e
ifiScanner.java
429b9fcb7b8d9f22ac70643d3423c01da1a76458 07-Apr-2016 Randy Pan <zpan@google.com> Merge "Enable/disable WifiConnectivityManager at runtime" into nyc-dev
f5c0a55d1eca29be3f63fbf07f7bd35ff5a68a62 07-Apr-2016 Rubin Xu <rubinxu@google.com> Fix wrong condition
am: 492ed58

* commit '492ed589df3609a15dd6a33709fc8d855ec1072d':
Fix wrong condition

Change-Id: I23f23c4b77d19286915e501bea482e4d1fe7e714
492ed589df3609a15dd6a33709fc8d855ec1072d 07-Apr-2016 Rubin Xu <rubinxu@google.com> Fix wrong condition

Bug: 28050399
Change-Id: If729ee2bcc5496b5ee381e490f72c751da04dc09
ifiEnterpriseConfig.java
74638cdb31a10fa6d013744d201bb12465dff3ea 01-Apr-2016 Randy Pan <zpan@google.com> Enable/disable WifiConnectivityManager at runtime

Add support to turn on and off WifiConnectivityManager at
runtime.

Bug: 27968625
Change-Id: I57d3604bfb2a4e816fb16f6389f7cbaa2460c24b
WifiManager.aidl
ifiManager.java
467400a23b365419bb64e58d34f70d287973d3f9 11-Mar-2016 Randy Pan <zpan@google.com> Obsolete a couple of auto-join related APIs.

Remove the get/setHalBasedAutojoinOffset() APIs. HAL based PNO
is now enabled on all supported devices.

Bug: 26666366
Change-Id: I55b3a80a5807c33569dbbdf4dcfc2411af067567
WifiManager.aidl
ifiManager.java
61b5a7689320274ce5fff9a9eae1866d8d696b9b 31-Mar-2016 Jan Nordqvist <jannq@google.com> Fixed incomplete OSEN config code.

Bug=27929688

Change-Id: I8f4a0415576e6dc35d735fa46dc50591478403af
ifiConfiguration.java
ifiEnterpriseConfig.java
612b4c588bbd81e36753f5a0f424208e91e580b6 30-Mar-2016 Mitchell Wills <mwills@google.com> Merge "Send WorkSource for scan requests so the origin can be overridden" into nyc-dev
133240f5654f2c10ab8acfd85ee88b51dbbbb549 30-Mar-2016 Mitchell Wills <mwills@google.com> Merge "Add WifiScanner API that accepts a WorkSource for scans" into nyc-dev
ad95b6a6eab43a6d5520780fd7af7e8d722f65b2 29-Mar-2016 Mitchell Wills <mwills@google.com> Send WorkSource for scan requests so the origin can be overridden

Bug: 27903217
Change-Id: I37b24c0f5b8e9408a9f25e4479cdbb71235757a6
ifiScanner.java
f51097c743fc43ac52b343cf1066801d918f6fa0 13-Jan-2016 zhangshuxiao <zhangshuxiao@xiaomi.com> When wifi ssid is empty, return WifiSsid.NONE

Issue 199610

When WifistateMachine enter Roaming State, WifiInfo
getSSID will return 0x, statusbar show "0x", because
roaming State do not update WifiInfo mWifiSsid.

Cherry pick from I241f8e9c11dc16db26cadde133043745f2f19573

BUG=27403109
TEST=compile and unittests
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>

Change-Id: Ieb7429511898a5ed3d44fd15fc1f250c122e802a
ifiInfo.java
ifiSsid.java
d24427fabda5ff0fda6fea40bed588680573388f 29-Mar-2016 Mitchell Wills <mwills@google.com> Add WifiScanner API that accepts a WorkSource for scans

Bug: 27903217
Change-Id: I2303a2b91a4914e6cacc3108d29697f7a2dad056
ifiScanner.java
89d9480be2dbb33e97a6efdf45bc6790eff1e5d0 29-Mar-2016 Roshan Pius <rpius@google.com> Merge changes from topic 'wifi_tx_power_levels' into nyc-dev

* changes:
Add new wifi tx power levels in Wifi activity energy
Add new wifi tx power levels in link layer stats
174b140dfe30f9a926eefaf118c6ccdb6a0b493e 29-Mar-2016 Rebecca Silberstein <silberst@google.com> Merge "Add hasEverConnected to NetworkStatus object" into nyc-dev
d1f33cc95009397056669bfc0ef4f8885fc62e12 26-Mar-2016 Mitchell Wills <mwills@google.com> Add accessor for buckets scanned in ScanData

Bug: 27506257
Change-Id: I9f7ae27ef8416de5e1b00dc63ee458e9e2ba69ab
ifiScanner.java
cd7167db2d8a18ad3e0a594c46e46d7ffafdaacc 26-Mar-2016 Rebecca Silberstein <silberst@google.com> Add hasEverConnected to NetworkStatus object

Add a boolean indicating if we have ever successfully connected to a
network given the current configuration. This value should be set to
true upon a successful connection and set to false if the credentials
change. The default value is false.

BUG: 27855896
Change-Id: I1af8f4ad7aac622b48f3c90d88b0debd671a1f40
ifiConfiguration.java
fb2d2cec7b6bb5412414b50f60b7b7bb0c67af76 25-Mar-2016 Mitchell Wills <mwills@google.com> Merge "Add bucketsScanned to ScanData" into nyc-dev
0a835f6e43cd52c88438d801d4fedda963ca147d 25-Mar-2016 Paul Stewart <pstew@google.com> Merge "WifiConfiguration: Remove dead commented code" into nyc-dev
e8ea325716621405ffb279496ca4273461145210 24-Mar-2016 Paul Stewart <pstew@google.com> WifiConfiguration: Remove dead commented code

Nobody uses this code. Let's clean up.

Bug: 27054653
Change-Id: I7b3dccd09de270de6fd5a17da3217495dbce421a
ifiConfiguration.java
a70cbf7f9cf7dbb12f7f6067c039c85bcac99361 24-Mar-2016 Samuel Tan <samueltan@google.com> Merge "ScanResult: add clarifying comments to |flags| and |capabilities| fields" into nyc-dev
52f0ea56db372761f7589eb052983731cb07eb62 24-Mar-2016 Jeremy Joslin <jjoslin@google.com> Merge "Add meteredHint to WifiConfiguration." into nyc-dev
40b5617e15e7f02de8346d99abe2a90edf0d17a0 23-Mar-2016 Samuel Tan <samueltan@google.com> ScanResult: add clarifying comments to |flags| and |capabilities| fields

Add internal comments to the |flags| and |capabilities| fields of
ScanResult to clarify their relationship to the fields in the per-BSS
scan results from WPA supplicant.

BUG: None
Change-Id: I8685283f8cc1006ffd22f2cb2ee8f8605cc0fd2b
TEST: N/A
canResult.java
0d193b44538a282e9000e455e566f516b5068c24 22-Mar-2016 Mitchell Wills <mwills@google.com> Add bucketsScanned to ScanData

Bug: 27506257
Change-Id: I3ac7c2030188798ba3398de1a1253195475116f8
ifiScanner.java
68ffbba158579dd8b6f32aa628ec91228786e864 22-Mar-2016 Paul Stewart <pstew@google.com> Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev

* changes:
WifiManager: Use ConnectivityThread
Create ConnectivityThread
ec1e5e80fc4d7897e17986e06bdf2e459a889827 22-Mar-2016 Paul Stewart <pstew@google.com> Merge "WifiManager: Defer Async Channel init" into nyc-dev
f0c9b8c68fd6f6deeab3d51a62a02f4ea17bdb98 17-Mar-2016 Jeremy Joslin <jjoslin@google.com> Add meteredHint to WifiConfiguration.

Adding a new field, meteredHint, to WifiConfiguration so that it
can be passed through and eventually used to set the meteredHint
field on WifiInfo.

BUG: 27120794
Change-Id: If08966c6a5e8eab0905f3335b1c6822975b2f0b5
ifiConfiguration.java
c12bb1dd8ca3e7a41b381d9a087e91d990b8545f 21-Mar-2016 Paul Stewart <pstew@google.com> Fix string equality comparison

Don't use "==" to compare strings.

Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
ifiEnterpriseConfig.java
bf8cbb05e085c4504685883f3dd564f200405bea 17-Mar-2016 Paul Stewart <pstew@google.com> WifiManager: Use ConnectivityThread

Instead of minting it's own hander thread, have WifiManager use
the looper from ConnectivityThread.

Bug: 27432949

Change-Id: Iddeebeb8ab506c912f526c7569f304e10b9d7ab8
ifiManager.java
75f129e17b05e6d51080cf1ab9eb5cdddecdc734 17-Mar-2016 Paul Stewart <pstew@google.com> WifiManager: Defer Async Channel init

Now that WifiManager instances are separate and do not depend
on a single static AsyncChannel for the entire process, all
contexts within a process will create an async channel on init.
Since creating this channel requires special permissions that
some applications do not have, it is problematic for them all
to request it in the process of getting a WifiManager instance.

This CL defers AsyncChannel initialization until it is actually
going to be used. This allows callers to create WifiManager
instances without necessarily creating an AsyncChannel.
Depending on what parts of the API will be used, some callers
will never need one. Also, this means that these apps will
not run afoul of permissions exceptions that do not apply to
them unless they actually request functionality that requires
the AsyncChannel.

While here, this CL no longer catches SecurityException while
requesting a messenger from WifiService. That hack appeared to
be an artifact of the static instance of sAsyncChannel -- it
was not clear to WifiManager which context had permissions to
successfully create the messenger, so it was necessary to
silently fail the attempt especially since that attempt was
made in the constructor. With the restructuring to keep
mAsyncChannel per-instance and now only created at the time
specific API calls require it, a SecurityException is
completely relevant to the caller and should not be discarded.

Bug: 27694933
Test: Boot full image, repro b/27694933 with com.google.android.music

Change-Id: I680bf2443bc5b057e629544a687f985261201ded
ifiManager.java
42e606250a13edc22cb9f14937a4d73c14cc41aa 16-Mar-2016 Roshan Pius <rpius@google.com> Add new wifi tx power levels in Wifi activity energy

BUG: 27227497
Change-Id: I66db7f61a5e3a8223a008f7182bb56921145c831
ifiActivityEnergyInfo.java
3ec7cfeedf50a9403a073e1fe4a76a71865ea2e9 16-Mar-2016 Roshan Pius <rpius@google.com> Add new wifi tx power levels in link layer stats

BUG: 27227497
Change-Id: I48dd88d2ab5ade8e5ad9bafa153925f4d55aba26
ifiLinkLayerStats.java
2a73c7fb2a4aba4dd75341414f1583e5fb1f4613 15-Mar-2016 Etan Cohen <etancohen@google.com> [NAN] Refactor session lifecycle to clarify API & eliminate race conditions [DO NOT MERGE]

Bug: 27257965
Change-Id: I4d7eaa6fa1f089bed2e9185f59a37f59b530975d
an/IWifiNanManager.aidl
an/IWifiNanSessionCallback.aidl
an/WifiNanEventCallback.java
an/WifiNanManager.java
an/WifiNanPublishSession.java
an/WifiNanSession.java
an/WifiNanSessionCallback.java
an/WifiNanSubscribeSession.java
e1e3d99c46374e7c85bde341da574eb3024c75e5 15-Mar-2016 Wei Wang <weiwa@google.com> Merge "Fix device reboot when ranging empty params." into nyc-dev
a5ed693788ea64408ccf18850ee38905218ec4f4 11-Mar-2016 Etan Cohen <etancohen@google.com> [NAN] Removed NAN event registration - dispatch all callbacks. [DO NOT MERGE]

All events dispatched by default - there's no reason to ignore events.
The specific identity changed events for which there are use-cases to
get or ignore is controlled through a new configuration.

Bug: 27607613
Change-Id: I289a36157b55270c58311a016ef79f8746e0e0a0
an/ConfigRequest.java
an/IWifiNanManager.aidl
an/WifiNanEventCallback.java
an/WifiNanManager.java
8414f5cf2bd86dcbaea1976590e838e41af554b3 11-Mar-2016 Etan Cohen <etancohen@google.com> [NAN] Consolidate publish/subscribe callback sets into single set [DO NOT MERGE]

Merge onPublishFail & onSubscribeFail into onSessionConfigFail.
Merge onPublishTerminated & onSubscribeTerminated into onSessionTerminated.
A session is either publish or subscribe (never the two) so redundant.

Bug: 27610709
Change-Id: I0282d17db88754428da25ee5f064b9a4805f9736
an/IWifiNanSessionCallback.aidl
an/WifiNanSessionCallback.java
e393f57d0de5a27d1cfd04a8c83a61559430539c 11-Mar-2016 Etan Cohen <etancohen@google.com> [NAN] Replace session callback configuration control [DO NOT MERGE]

Controlling session callback invocation:
- Remove event registration
- Add configurations to the subset (actually just termination) which
can be configured through the HAL

Bug: 27607613
Change-Id: I608314cc2a9b077b4d5a2d2d0d315d55c6a7724b
an/IWifiNanManager.aidl
an/PublishConfig.java
an/SubscribeConfig.java
an/WifiNanManager.java
an/WifiNanSessionCallback.java
8ef74534169bd3f3296e2ee42c0fda95c8518383 09-Mar-2016 Etan Cohen <etancohen@google.com> [NAN] Expose match style configuration as public API. [DO NOT MERGE]

Match style allows apps to configure getting a single notification
or continuous notifications (for all matches).

Bug: 27568256
Change-Id: I9b7bd2e4e58af5c73188267d11c1288a93cf64ed
an/PublishConfig.java
an/SubscribeConfig.java
an/WifiNanPublishSession.java
an/WifiNanSubscribeSession.java
fabae2fff0556efffda842081f290ecd04c56aec 09-Mar-2016 Wei Wang <weiwa@google.com> Fix device reboot when ranging empty params.

Empty Rtt params was converted to null in
read/write paracel.

Bug:27227320

Change-Id: I7c9c897b0f7ed0ced499e9763dd56b48d209d195
ttManager.java
0f3b7ac4b5cc689243176a960ba004f19cf95bc1 14-Mar-2016 Paul Stewart <pstew@google.com> Merge "WifiManager: Remove static objects" into mm-wireless-dev
am: d292ed866c

* commit 'd292ed866c27bc7a23cfa292603d722a6b7f9d81':
WifiManager: Remove static objects
d292ed866c27bc7a23cfa292603d722a6b7f9d81 14-Mar-2016 Paul Stewart <pstew@google.com> Merge "WifiManager: Remove static objects" into mm-wireless-dev
a016ebbee7c9cf37bc19044e787b02bfb59f2f98 25-Feb-2016 Paul Stewart <pstew@google.com> WifiManager: Remove static objects

Thanks to b/24334032, we know that there can be more than one
WifiManager object per process. Also, due to b/19159232 we know
that holding static references to contexts within WifiManager is
not okay. This CL addresses both issues by correctly implementing
Wifimanager as the per-context CachedService as it is instantiated
in SystemServiceRegistry.

To do this, all previously static object members of WifiManager
are converted to non-static. This is primarily safe since:

- In processes which only instantiated WifiManager from a single
context, the behavior is functionally identical between the
static and non-static implementation.

- In situations where multiple WifiManager objects were created,
this is not a real issue:

+ sListenerKey is okay to be tracked per-instance since it
only tracks replies for asynchronous outgoing calls for a
single WifiManager instance (replies are not multicast to
all instances within a pid, since replies from
WifiServiceImpl are addressed to the other end of the
AsyncConnection the request message came from).
+ The same is true of sListenerMap and sListenerMapLock
+ Having a per-WifiManager-instance mAsyncChannel is at worst
a small linear increase with the number of contexts that
use WifiManager, but for the vast majority of processes will
not be an increase at all.
+ Having a thread per WifiManager is something that has been
brought up in the past (b/25644527 comes to mind). I think
we should continue to track that particular problem there.

One static was added: an sServiceHandlerDispatchLock which ensures
that listeners from multiple ServiceHandler threads will be called
sequentially instead of interleaved. Since ServiceHandler was
previously static, this preserves the behavior where multiple
WifiManager objects would not deliver callbacks in parallel.

BUG=19159232
BUG=24334032

Change-Id: I24125a285f97e0c5b3ca4fd721ba8ed19aa245e9
ifiManager.java
ae0da24c8d64df4eac1ecf15c2987cdffecbfd5e 08-Mar-2016 Glen Kuhne <kuh@google.com> Merge "Added EIDs for ERP, Supported & Extended Rates" into mm-wireless-dev
am: 45eb1bdf87

* commit '45eb1bdf8788bc2aa537ec86bc93b3bf437d9c6e':
Added EIDs for ERP, Supported & Extended Rates
45eb1bdf8788bc2aa537ec86bc93b3bf437d9c6e 08-Mar-2016 Glen Kuhne <kuh@google.com> Merge "Added EIDs for ERP, Supported & Extended Rates" into mm-wireless-dev
4e7ad35b2f1e1a9bdcabfb56306dd162909932a8 07-Mar-2016 Roshan Pius <rpius@google.com> Merge "WifiScanner: Add hidden networkIds in scan setting" into mm-wireless-dev
am: d412376ca0

* commit 'd412376ca00545857df7a21829e3f674253c0567':
WifiScanner: Add hidden networkIds in scan setting
d412376ca00545857df7a21829e3f674253c0567 07-Mar-2016 Roshan Pius <rpius@google.com> Merge "WifiScanner: Add hidden networkIds in scan setting" into mm-wireless-dev
2a3ca73158227751321e98ba707496adf84007a6 29-Feb-2016 Lorenzo Colitti <lorenzo@google.com> DO NOT MERGE: Move PinningNetworkCallback out to a new NetworkPinner class.

Cherry-picked from 531a34430072b9296aaeb47d9e7d04326a93fee4

Bug: 19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
ifiManager.java
bff37ecdaa7c31b1c750ea78b3206bf5d8949eef 01-Mar-2016 Glen Kuhne <kuh@google.com> Added EIDs for ERP, Supported & Extended Rates

Added EIs to InformationElement to support the parsing of Supported
Rates, Extended Supported Rates, and ERP.

BUG=25691077
Change-Id: Ie540e94f9aa0dca11c3b1d6a46c5a638ec958cff
canResult.java
49b6f19dedbe4a2a40f715d6d7d6c52eacff104a 05-Mar-2016 Roshan Pius <rpius@google.com> WifiScanner: Add hidden networkIds in scan setting

Add the hidden networkId list in scan settings to be used for
connectivity scans.

BUG: 27503786
Change-Id: Ibe7eaccd84d03a7b48728e3ea1d98ccc974377ec
TEST: Compiles & unit-test passes
ifiScanner.java
56eac1328451a973984f39bb107ac808c3483465 04-Mar-2016 Roshan Pius <rpius@google.com> WifiScanner: Add PNO public API
am: e4fd150962

* commit 'e4fd150962e07dbcb0646d556bf372be0cc15f1f':
WifiScanner: Add PNO public API
e4fd150962e07dbcb0646d556bf372be0cc15f1f 01-Mar-2016 Roshan Pius <rpius@google.com> WifiScanner: Add PNO public API

Add the public interface for starting/stopping PNO scan.

This is the internal flow that is going to be used for PNO scan:
1. Set Pno list
2. Start background scan

This flow will not work as is for supplicant, since background scan is
done manually today. So, we'll need a flag to indicate that this
background scan is targetted for PNO.

BUG: 27167559
Change-Id: I3f6921c5d03f7d9e8ad1847e57e12fb38df6c9c9
TEST: Compiles & unit-test passes
ifiScanner.java
d4ef42f0e5eb1862850dc75a7004aaa421fedfa8 03-Mar-2016 mukesh agrawal <quiche@google.com> Merge "WifiConfiguration: show more detail in toString()" into mm-wireless-dev
am: 7516adbd6d

* commit '7516adbd6d8584aff957ff722dd20543c25c6897':
WifiConfiguration: show more detail in toString()
7516adbd6d8584aff957ff722dd20543c25c6897 03-Mar-2016 Mukesh Agrawal <quiche@google.com> Merge "WifiConfiguration: show more detail in toString()" into mm-wireless-dev
b94df9db50b3813d9836ebc0a4e650f2fd090756 03-Mar-2016 Jeremy Joslin <jjoslin@google.com> Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev
am: 3f7314e331

* commit '3f7314e3310fbaddc984ae3218f7bb22f13cda11':
Revert "New systemapi to mark a wifi network as metered."
3f7314e3310fbaddc984ae3218f7bb22f13cda11 03-Mar-2016 Jeremy Joslin <jjoslin@google.com> Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev
e23993848c65c7fb2c91bb89989117d35dabe5c3 03-Mar-2016 mukesh agrawal <quiche@google.com> WifiConfiguration: show more detail in toString()

When debugging WiFi issues, it's helpful to know whether
or not a network uses a hidden SSID. Update
WifiConfiguration.toString(), to provide this information.

BUG=26836097
TEST=capture bugreport, verify "HIDDEN: false" is present for normal net
TEST=capture bugreport, verify "HIDDEN: true" is present for hidden net

Change-Id: I1f7c587fc2eda358e0868e9a7ef0bb2058e726a8
ifiConfiguration.java
e9e6083ee19b7474d853b4b8c3e4b4fbcba30855 02-Mar-2016 Jeremy Joslin <jjoslin@google.com> Revert "New systemapi to mark a wifi network as metered."

This reverts commit 7a598d3d800fc47b7c2f9300411edc0ef06da493.

Change-Id: Ib6b9081ee4ded7582fb90d7a9066de95ab221f61
ifiManager.java
b7ffb764370805aa0734d2f31bc2def34df04d86 02-Mar-2016 Lorenzo Colitti <lorenzo@google.com> Merge changes Ic366b532,I0179b45b into nyc-dev

* changes:
Move PinningNetworkCallback out to a new NetworkPinner class.
Use MessageUtils in ConnectivityManager.
531a34430072b9296aaeb47d9e7d04326a93fee4 29-Feb-2016 Lorenzo Colitti <lorenzo@google.com> Move PinningNetworkCallback out to a new NetworkPinner class.

Also add tests.

Bug: 19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
ifiManager.java
c53962d4ede82a03b62f0c8bb86bd0da090a15eb 02-Mar-2016 Jeff Sharkey <jsharkey@android.com> When system server goes down, crash apps more.

Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.

The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.

Bug: 27364859
Change-Id: Ife0bcb079636c88d54c44d17eb580409fd79028b
ttManager.java
ifiManager.java
an/WifiNanManager.java
2p/WifiP2pManager.java
037dd4aea06b5c473dcba0d6f3e8efd3ed7b0748 25-Feb-2016 Randy Pan <zpan@google.com> Retire ScanResult.autoJoinStatus
am: 366da67282

* commit '366da672828864fa166f184757e44f89e5139a31':
Retire ScanResult.autoJoinStatus
366da672828864fa166f184757e44f89e5139a31 24-Feb-2016 Randy Pan <zpan@google.com> Retire ScanResult.autoJoinStatus

This attribute is no longer in use.

Bug: 27340037
Change-Id: I2e5dfdc266673388a55ef34a4d088352d2e1723c
canResult.java
e0e00dc79c461e57af855a388e702f7f0e9d3caa 23-Feb-2016 Roshan Pius <rpius@google.com> Merge "Modify the wake reasons data structure(2/2)" into mm-wireless-dev
am: 2d3bea7f01

* commit '2d3bea7f014a7fa2eff91ce996663059218bf21d':
Modify the wake reasons data structure(2/2)
ad3693d59b990f4994f96f6d3ca98cdbfe26723c 18-Feb-2016 Etan Cohen <etancohen@google.com> [NAN] API cleanup - rename FLAGS. [DO NOT MERGE]

Per API guidelines - non-overlapping constants can be (should be)
named with "FLAG".

Bug: 27122760
Change-Id: If8b2c0f9b2818215a64b5635e76731c8fdfd3b8d
an/WifiNanEventCallback.java
an/WifiNanSessionCallback.java
2d3bea7f014a7fa2eff91ce996663059218bf21d 23-Feb-2016 Roshan Pius <rpius@google.com> Merge "Modify the wake reasons data structure(2/2)" into mm-wireless-dev
f89786f31c8627855da73600afdab696ed92e742 23-Feb-2016 Wei Wang <weiwa@google.com> Merge "Disallow duplicate listeners for WifiScanner." into mm-wireless-dev
am: 3c0d65de0b

* commit '3c0d65de0bbd7889f340aca4a45e55972de5896f':
Disallow duplicate listeners for WifiScanner.
3c0d65de0bbd7889f340aca4a45e55972de5896f 23-Feb-2016 Wei Wang <weiwa@google.com> Merge "Disallow duplicate listeners for WifiScanner." into mm-wireless-dev
5045253e3e4b9b1c0cf3feea087843d431ed1d1b 19-Feb-2016 Glen Kuhne <kuh@google.com> Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev
am: 70fc162330

* commit '70fc1623301ab5268c54bb203329893893ed35cb':
Add EID_TIM to ScanResult.InformationElement
70fc1623301ab5268c54bb203329893893ed35cb 19-Feb-2016 Glen Kuhne <kuh@google.com> Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev
b6cd6fa5a7314047409823ba48ff9e124ff53a70 11-Feb-2016 Glen Kuhne <kuh@google.com> Add EID_TIM to ScanResult.InformationElement

Added EID_TIM to enable parsing of TrafficIndicationMap
InformationElements.

BUG=25691077
Change-Id: I99450f0b720175660486da15d6b13affbdb61adc
canResult.java
ifiConfiguration.java
13f378e738746800517f98b8561da315993c240a 18-Feb-2016 Roshan Pius <rpius@google.com> Modify the wake reasons data structure(2/2)

Changes in the android framework to use the modifed HAL API to
fetch the host wakeup reasons from the driver.

BUG: 26902794

Change-Id: I4df53c00b6b4ffd9f9ddb45577f6bccf150c43e4
ifiWakeReasonAndCounts.java
173aa05908588de731d23f0ee0c3a66611af7e88 19-Feb-2016 Paul Stewart <pstew@google.com> Properly map EAP-GTC for TTLS
am: 274042519d

* commit '274042519d84ad837f03572865bc096a537c73fb':
Properly map EAP-GTC for TTLS
274042519d84ad837f03572865bc096a537c73fb 16-Jan-2016 Paul Stewart <pstew@google.com> Properly map EAP-GTC for TTLS

The "auth=GTC" method was never valid for the TTLS outer
authentication for wpa_supplicant. Instead, to perform
GTC authentication within TTLS, we should use EAP-GTC.

This CL performs this mapping within WifiEnterpriseConfig.
It accomplishes this by making the EAP Method and Phase 2
Method parameters a part of the internal object state
instead of maintaining this value within the mFields
hashmap.

Further, the problematic "getFields" method is removed
since as this actually provided read/write access to the
entirety of the WifiEnterpriseConfig's internal state.
This was understandably suboptimal. All callers have
been updated to either use getFieldValue() or to call
a newly added getSupplicantFields() / setSupplicantFields()
methods which make the WifiEnterpriseConfig object a sole
arbiter for the mapping between its internal state and
wpa_supplicant.

In the future it might be good to change this logic to
strip WifiEnterpriseConfig of all of the string hashmap
entirely, leaving WifiEnterpriseConfig as a "struct"
and move supplicant mappings to WifiConfigStore.

Bug:26400915
Change-Id: I866e2f77ad53d9a51c5f61acb9adef522661f721
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
ifiEnterpriseConfig.java
0a05e4aef9fd83cef23d785c608faaf64cd408f8 19-Feb-2016 Wei Wang <weiwa@google.com> Merge "Add Java API for secure RTT protocol." into mm-wireless-dev
am: 0db6066c7b

* commit '0db6066c7b0583610769fb0f9bc80ceafedefb75':
Add Java API for secure RTT protocol.
0db6066c7b0583610769fb0f9bc80ceafedefb75 19-Feb-2016 Wei Wang <weiwa@google.com> Merge "Add Java API for secure RTT protocol." into mm-wireless-dev
3cf4da988640cd80cdf087c4c4b5c9534be3b308 17-Feb-2016 Wei Wang <weiwa@google.com> Disallow duplicate listeners for WifiScanner.

Bug:26663377

Change-Id: I2eea0fd3532c45f493aad7c0d5c28bda07f5bfed
ifiScanner.java
0d0f0c7faf530a0fa5595dd539c3f56afeb6603a 18-Feb-2016 Etan Cohen <etancohen@google.com> [NAN] Renamed listeners to callback per API guidelines [DO NOT MERGE]

The interfaces had multiple functions and are hence callback
and not a listener.

Note: purely a rename operation.

Bug: 27122760
Change-Id: Ib12711f56a64052455843859125d72268c465fc0
an/IWifiNanEventCallback.aidl
an/IWifiNanEventListener.aidl
an/IWifiNanManager.aidl
an/IWifiNanSessionCallback.aidl
an/IWifiNanSessionListener.aidl
an/WifiNanEventCallback.java
an/WifiNanEventListener.java
an/WifiNanManager.java
an/WifiNanSession.java
an/WifiNanSessionCallback.java
an/WifiNanSessionListener.java
e4c50de75273efaec4e9e8db6174e0bfc07d3105 17-Feb-2016 Etan Cohen <etancohen@google.com> [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config [DO NOT MERGE]

Simplify configuration and consolidate structures whose difference
wasn't very clear.

Bug: 27122760
Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de
an/IWifiNanManager.aidl
an/PublishConfig.aidl
an/PublishConfig.java
an/PublishData.aidl
an/PublishData.java
an/PublishSettings.aidl
an/PublishSettings.java
an/SubscribeConfig.aidl
an/SubscribeConfig.java
an/SubscribeData.aidl
an/SubscribeData.java
an/SubscribeSettings.aidl
an/SubscribeSettings.java
an/WifiNanManager.java
an/WifiNanPublishSession.java
an/WifiNanSessionListener.java
an/WifiNanSubscribeSession.java
71210b10225dd7c40ca1a07736c9d4c8559f5085 18-Feb-2016 Wei Wang <weiwa@google.com> Add Java API for secure RTT protocol.

Change-Id: I1c012f9e92e8b2af332524363f8f0c9921bf4bb5
ttManager.java
aa36f07194b29adee881e684b63f8bbdee6097bc 17-Feb-2016 Etan Cohen <etancohen@google.com> NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]

Add the concept of a client ID which is used to identify a specific
(one of several) clients in all API calls.

Bug: 26962024
Change-Id: I43f13d51bee8b57c6d0ba1174168288b8d6c21c5
an/IWifiNanManager.aidl
an/WifiNanManager.java
4dbf436cacf3278d607d4692a8596f35771b8567 17-Feb-2016 Mitchell Wills <mwills@google.com> Merge "Remove REPORT_EVENT_CONTEXT_HUB gscan option" into mm-wireless-dev
am: 07e27b7541

* commit '07e27b75412de52b3ba5606e35a721e2b31ff094':
Remove REPORT_EVENT_CONTEXT_HUB gscan option
07e27b75412de52b3ba5606e35a721e2b31ff094 17-Feb-2016 Mitchell Wills <mwills@google.com> Merge "Remove REPORT_EVENT_CONTEXT_HUB gscan option" into mm-wireless-dev
b3f9ee0d5a1c0a45d957a6e50f4ada3a8e3592dd 16-Feb-2016 Peter Qiu <zqiu@google.com> Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev
am: 03d7581cf6

* commit '03d7581cf6dcc8072fe22c834513593a46fcf93b':
WifiConfiguration: add constants for radio band
03d7581cf6dcc8072fe22c834513593a46fcf93b 16-Feb-2016 Peter Qiu <zqiu@google.com> Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev
3e425f6c4be3fc30695473329c6364abfe69a059 15-Feb-2016 Bartosz Fabianowski <bartfab@google.com> Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev
am: e1bdbd216f

* commit 'e1bdbd216fef6d1f0bb6b3c61cc95abba3e67af7':
Remove wifiConfiguration.isVisibleToUser()
9fcf3ca4ded8cd68995b9e9281c223e92ba0d7be 02-Feb-2016 Joe Onorato <joeo@google.com> Turn down the logging a little bit.

Change-Id: Iec36925e3aff1490c8808bdc7a6bd39e7d549556
ttManager.java
d6676166599b7cadd043b0bd400aeace3059621b 12-Feb-2016 Peter Qiu <zqiu@google.com> WifiConfiguration: add constants for radio band

Change-Id: I2287ffb3d93351d73659327cef37a6d3ecd588b3
ifiConfiguration.java
67a28e8c3809f7d68999f586edd7d7ff4bd27c9b 12-Feb-2016 Paul Stewart <pstew@google.com> Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev
am: 323561773f

* commit '323561773f43f561997155aed4654a6be3299511':
Revert "Properly map EAP-GTC for TTLS"
323561773f43f561997155aed4654a6be3299511 12-Feb-2016 Paul Stewart <pstew@google.com> Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev
d3be75fd4babcad6e83b005d0cca9c13ec3c9f44 12-Feb-2016 Paul Stewart <pstew@google.com> Revert "Properly map EAP-GTC for TTLS"

This reverts commit be5084b87aa6a5e97becac6a43b448fee34196c2.

Reverting to re-land after test team does their thing

Change-Id: Ia236b77f08d15f47efb5469478000ded3b0d7954
ifiEnterpriseConfig.java
825fb3492a02b4a4101bf9039d2f020ad131193f 12-Feb-2016 Paul Stewart <pstew@google.com> Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev
am: 724ea69e4b

* commit '724ea69e4b4d79d59629e8152f2b0183e13aa45e':
Properly map EAP-GTC for TTLS
724ea69e4b4d79d59629e8152f2b0183e13aa45e 12-Feb-2016 Paul Stewart <pstew@google.com> Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev
00144e8de35dbdc3a477862ef8d92a6fa8191142 11-Feb-2016 Bartosz Fabianowski <bartfab@google.com> Remove wifiConfiguration.isVisibleToUser()

This method seemed like a good idea at the time (quickly check whether a
network configuration is visible to a given user). However, once managed
profiles come into play, this simple method is no longer appropriate.
There is a more comprehensive replacement at
com.android.server.wifi.WifiConfigurationUtil.isVisibleToAnyProfile()
now and this method here can go.

BUG:26867426

Change-Id: Ia66aa6f74003a16eca24c5088d3aba8e0c9f8140
ifiConfiguration.java
fa8e9aabe2962fd8262bd669821c37aed60fddcc 12-Feb-2016 Etan Cohen <etancohen@google.com> NAN: Disable all DBG flags.
am: 7d6c389edf

* commit '7d6c389edf41ef8ce490fa7af963484f9502cbc1':
NAN: Disable all DBG flags.
7d6c389edf41ef8ce490fa7af963484f9502cbc1 11-Feb-2016 Etan Cohen <etancohen@google.com> NAN: Disable all DBG flags.

Change-Id: Ib60cf3c9fd4c8dbf973e118d94340fbfd890a738
an/WifiNanEventListener.java
an/WifiNanManager.java
an/WifiNanSession.java
an/WifiNanSessionListener.java
be5084b87aa6a5e97becac6a43b448fee34196c2 16-Jan-2016 Paul Stewart <pstew@google.com> Properly map EAP-GTC for TTLS

The "auth=GTC" method was never valid for the TTLS outer
authentication for wpa_supplicant. Instead, to perform
GTC authentication within TTLS, we should use EAP-GTC.

This CL performs this mapping within WifiEnterpriseConfig.
It accomplishes this by making the EAP Method and Phase 2
Method parameters a part of the internal object state
instead of maintaining this value within the mFields
hashmap.

Further, the problematic "getFields" method is removed
since as this actually provided read/write access to the
entirety of the WifiEnterpriseConfig's internal state.
This was understandably suboptimal. All callers have
been updated to either use getFieldValue() or to call
a newly added getSupplicantFields() / setSupplicantFields()
methods which make the WifiEnterpriseConfig object a sole
arbiter for the mapping between its internal state and
wpa_supplicant.

In the future it might be good to change this logic to
strip WifiEnterpriseConfig of all of the string hashmap
entirely, leaving WifiEnterpriseConfig as a "struct"
and move supplicant mappings to WifiConfigStore.

Bug:26400915
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I1e09fb3f1f27b2ba844acbed14ec0f570e915b80
ifiEnterpriseConfig.java
cea11df038465ad15dc7d33c39a1bbbc3864aa99 11-Feb-2016 Paul Stewart <pstew@google.com> Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev
am: 4e9e3d02e0

* commit '4e9e3d02e057ddccb95d5299e60ac02da7766024':
WifiManager: Return empty scan list on remote exception
4e9e3d02e057ddccb95d5299e60ac02da7766024 11-Feb-2016 Paul Stewart <pstew@google.com> Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev
ed9297991a922b88a00c04d034c172c18d550ac1 11-Feb-2016 Paul Stewart <pstew@google.com> WifiManager: Return empty scan list on remote exception

In the (hopefully rare) situation where there is a remote exception
from a call to getScanResults(), do not pass null back to callers.
Nobody expects this, and failures that occur as a result can distract
from the real problem (e.g., the system server crashing). This CL
now returns an empty list.

BUG=27139097
TEST=None

Change-Id: I637eae1fa8ac1a1bc2b76dea8628359b5dec06e1
ifiManager.java
5c55babd64d0ba3bbed77739587594e22bfa3b52 11-Feb-2016 Jeremy Joslin <jjoslin@google.com> Merge "New systemapi to mark a wifi network as metered." into mm-wireless-dev
am: 3d4acbf5fb

* commit '3d4acbf5fbe74133b70b0bec51a387428f251ac1':
New systemapi to mark a wifi network as metered.
7a598d3d800fc47b7c2f9300411edc0ef06da493 10-Feb-2016 Jeremy Joslin <jjoslin@google.com> New systemapi to mark a wifi network as metered.

The implementation will come after the wifi code base has stablized.

BUG:27120794
Change-Id: I6a8140dae45dcd7ec70ac0c51b9513b907a41b63
ifiManager.java
5a982939d22b7fd3cb2a6ba107119b18f4904ca6 10-Feb-2016 Mitchell Wills <mwills@google.com> Remove REPORT_EVENT_CONTEXT_HUB gscan option

Since all scan results will now be reported to the context hub this flag
is no longer needed.

Change-Id: I21c157a31fe26169606f6f53e8e0ce44d57c5ca5
ifiScanner.java
70cffc57e5e3884054080e0066fa7fc34243daec 10-Feb-2016 Ritesh Reddy <riteshr@google.com> Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev
am: c4a1188afd

* commit 'c4a1188afd81b4b773e30ec184839bc1a82b355d':
Enabling SoftAP Configuration Backup.
c4a1188afd81b4b773e30ec184839bc1a82b355d 10-Feb-2016 Ritesh Reddy <riteshr@google.com> Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev
12232f76fd33c05f0408c184f1992064251988be 09-Feb-2016 Randy Pan <zpan@google.com> Merge "Add RSN Information Element ID" into mm-wireless-dev
am: 2750b41d0b

* commit '2750b41d0b50eb66c8aada11d62666f934ca950d':
Add RSN Information Element ID
2750b41d0b50eb66c8aada11d62666f934ca950d 09-Feb-2016 Randy Pan <zpan@google.com> Merge "Add RSN Information Element ID" into mm-wireless-dev
eddbff07c42684596e9d2121958fee86cfb70142 09-Feb-2016 Samuel Tan <samueltan@google.com> Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev
am: 8629390701

* commit '8629390701efe0ed74730a06ab2fc868a7ca265d':
WifiEnterpriseConfig: allow getting and setting of ca_path
8629390701efe0ed74730a06ab2fc868a7ca265d 09-Feb-2016 Samuel Tan <samueltan@google.com> Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev
b1540f139d6924555a4c333d10b34ccbccf87331 09-Feb-2016 Jan Nordqvist <jannq@google.com> Merge "Fixed bad auto-generated method name." into mm-wireless-dev
am: cf132a1bbc

* commit 'cf132a1bbc676489cfa757317edf8af90c10a105':
Fixed bad auto-generated method name.
cf132a1bbc676489cfa757317edf8af90c10a105 09-Feb-2016 Jan Nordqvist <jannq@google.com> Merge "Fixed bad auto-generated method name." into mm-wireless-dev
c5c898640fd79562a3f278dbe825b39b0b65c7f7 09-Feb-2016 Wei Wang <weiwa@google.com> Merge "Enable RTT Responder Role (1/4)." into mm-wireless-dev
am: 03a6b18350

* commit '03a6b1835060b6c2082ea231fb1ad539aefd916e':
Enable RTT Responder Role (1/4).
03a6b1835060b6c2082ea231fb1ad539aefd916e 09-Feb-2016 Wei Wang <weiwa@google.com> Merge "Enable RTT Responder Role (1/4)." into mm-wireless-dev
aeb4c0601330f5f30fe0026a714ff59f0fe90abf 26-Jan-2016 Ritesh Reddy <riteshr@google.com> Enabling SoftAP Configuration Backup.

SoftAp Conf is backed up as a serialized WifiConfiguration
object.

Change-Id: Ib7f4d130600313a67b710b45df274e15f0baad24
ifiConfiguration.java
cb71c477a2d06629ea5239ed5da968bb9681970d 05-Feb-2016 Etan Cohen <etancohen@google.com> Merge "NAN: for failed configurations - added configuration which failed." into mm-wireless-dev
am: 02033f800b

* commit '02033f800bda142994e402f3f66aaecb1c9f41be':
NAN: for failed configurations - added configuration which failed.
02033f800bda142994e402f3f66aaecb1c9f41be 05-Feb-2016 Etan Cohen <etancohen@google.com> Merge "NAN: for failed configurations - added configuration which failed." into mm-wireless-dev
afebe357fbbdbfef8e274c1c5ae449d746fa0d93 05-Feb-2016 Jan Nordqvist <jannq@google.com> Fixed bad auto-generated method name.

Change-Id: Ic60b0658f0b6a6e06dc9cf82299fe95bbd308972
asspointManagementObjectDefinition.java
c0e86b2e90d46cfa51519e8e3d91aad18ffcdb09 04-Feb-2016 Randy Pan <zpan@google.com> Add RSN Information Element ID

Bug: 26908033
Change-Id: I9d7aa7642c51ea59a58e8facc8ad7af681c32b23
canResult.java
e678624958a63be5c05705a2f75eb22bcec3376b 04-Feb-2016 Jan Nordqvist <jannq@google.com> Fixed bad serialization code in ScanResult.
am: 7a504417f2

* commit '7a504417f23a1388d2a9bf53f0871d274e70c6b2':
Fixed bad serialization code in ScanResult.
7a504417f23a1388d2a9bf53f0871d274e70c6b2 03-Feb-2016 Jan Nordqvist <jannq@google.com> Fixed bad serialization code in ScanResult.

Bug: 26964162
Change-Id: Ie9ad65936ab5173533773e5a711bcb81799acfb5
canResult.java
962c6a81e3f9b3ea6b4b178ca41a87230864525e 03-Feb-2016 Jan Nordqvist <jannq@google.com> Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev
am: fd600b1113

* commit 'fd600b1113af6f66e28b65f5b53f4a7c751cdef9':
New System APIs for Passpoint r2 app.
564527dc5af7e1a61196273f4e02835924a4a14f 21-Jan-2016 Wei Wang <weiwa@google.com> Enable RTT Responder Role (1/4).

Change-Id: Ic1cd9056b3ebc67759d628a45b34287e5b0320b6
ttManager.java
a772f0cf34f0db67997cb31fa44315c0933563da 28-Jan-2016 Vinit Deshpande <vinitd@google.com> New System APIs for Passpoint r2 app.

Change-Id: I09428e9a393999f43aefe5efd77cffe4b1b17da5
nqpInformationElement.java
WifiManager.aidl
asspointManagementObjectDefinition.aidl
asspointManagementObjectDefinition.java
canInfo.aidl
canInfo.java
canResult.java
ifiConfiguration.java
ifiEnterpriseConfig.java
ifiManager.java
8340beca6282093d9932ea30ef010024f75c689a 28-Jan-2016 Etan Cohen <etancohen@google.com> NAN: for failed configurations - added configuration which failed.

Bug: 26880665
Change-Id: I3c43edfc1a6ba43d7cc393a00c4f41fd2e245f2d
an/IWifiNanEventListener.aidl
an/IWifiNanManager.aidl
an/IWifiNanSessionListener.aidl
an/WifiNanEventListener.java
an/WifiNanSessionListener.java
c136cf95393fb8f646b95cccd038ca9cb3450214 30-Jan-2016 Samuel Tan <samueltan@google.com> WifiEnterpriseConfig: allow getting and setting of ca_path

Add getters and setters for WPA supplicant's ca_path directive.

BUG: 26879191
Change-Id: Iad2857ddf7f09dd918637f99f740932e1fb7187c
TEST: WifiEnterpriseConfigTest CTS test
ifiEnterpriseConfig.java
b8c17cc30b9b5f9bb9fcd67abdad4877a84ddae4 30-Jan-2016 Mitchell Wills <mwills@google.com> Merge "Add a hidden anqp field to ScanResult" into mm-wireless-dev
am: 934b3b9c6c

* commit '934b3b9c6c83a372d5def7abaf22d0f185a810de':
Add a hidden anqp field to ScanResult
934b3b9c6c83a372d5def7abaf22d0f185a810de 30-Jan-2016 Mitchell Wills <mwills@google.com> Merge "Add a hidden anqp field to ScanResult" into mm-wireless-dev
9eeba37851ef432cca7e35675a6b64b2b83b802c 28-Jan-2016 Mitchell Wills <mwills@google.com> Add a hidden anqp field to ScanResult

This allows ScanResults from WifiScanner to contain anqp data

Bug: 26525037
Change-Id: I54beb3c4e0b8bff06a8255d2dc53439941be3c66
canResult.java
82438d35cfb0ba48ca68c19accd984e24389fe4c 28-Jan-2016 Etan Cohen <etancohen@google.com> Merge "NAN: add message ID to correlate message callbacks to original message" into mm-wireless-dev
am: 638856c621

* commit '638856c6219e3b97ba0c398463a69cb758f07bdb':
NAN: add message ID to correlate message callbacks to original message
638856c6219e3b97ba0c398463a69cb758f07bdb 28-Jan-2016 Etan Cohen <etancohen@google.com> Merge "NAN: add message ID to correlate message callbacks to original message" into mm-wireless-dev
cb3308a3352a9cf8f970653a6568b9548a46d185 28-Jan-2016 xin He <xinhe@google.com> Merge "Remodel Network Selection" into mm-wireless-dev
am: 2fdee90b68

* commit '2fdee90b685781ec5e30f0788b727f692df32d40':
Remodel Network Selection
2fdee90b685781ec5e30f0788b727f692df32d40 28-Jan-2016 xin He <xinhe@google.com> Merge "Remodel Network Selection" into mm-wireless-dev
584dc6b8b9628d930de4ea3ad94894886294b855 26-Jan-2016 xinhe <xinhe@google.com> Remodel Network Selection

There are two main changes in this CL:
(1) Add user selection preference support. If user
explicitly chooses a network, framework will remember
it and consider user has a higher preference of this
network over all other visible networks.

(2) Seperate user set BSSID and framework chosen BSSID.
The BSSID under WifiConfiguration is set by user and is
not allowed to be overrided. The BSSID under Network
selection status is the best BSSID chosen by the
framework to associate with.

BUG=26012244
BUG=26721725

Change-Id: Iece91d20b139ef1c6aec05828c734d1706d81007
ifiConfiguration.java
7705a0d6ad04fb3c6f32c7700d09f13fdf7c9cee 27-Jan-2016 Rubin Xu <rubinxu@google.com> resolve merge conflicts of b84954cf92 to master.

Change-Id: I8a5a1a989968c46ea4807db9e7e06b298244876d
b84954cf92dbedd7ef3c4cd6868cad9e5b637d7d 27-Jan-2016 Rubin Xu <rubinxu@google.com> Merge "API to set multiple CA certificates for WifiEnterpriseConfig" into mm-wireless-dev
9465a0383148338a702818f65029b051f58d9219 26-Jan-2016 Vinit Deshpande <vinitd@google.com> Merge "Remove older passpoint code that we never made to work" into mm-wireless-dev
am: 82c8b7edd0

* commit '82c8b7edd0656bcab79411c8dbfe3651a314a559':
Remove older passpoint code that we never made to work
b0fde5d79d4f6a0ad492ef576dca88e2c8196ae7 26-Jan-2016 Etan Cohen <etancohen@google.com> NAN: add message ID to correlate message callbacks to original message

Add message ID to be specified by caller to each message. Same message ID
is provided back in callbacks indicating message send success or failure.

Bug: 26769293
Change-Id: I83958d5d219b02c153b0b93d707eaadfdacbf0dc
an/IWifiNanManager.aidl
an/IWifiNanSessionListener.aidl
an/WifiNanManager.java
an/WifiNanSession.java
an/WifiNanSessionListener.java
cb90cfbe16ab4828eaee3ab3b2de864a1f83fb06 26-Jan-2016 Vinit Deshpande <vinitd@google.com> Remove older passpoint code that we never made to work

Since we are hiding MO trees et al; there is no reason to
keep this code anymore.

Change-Id: Ic92131b5949c3b97b7a55fa7d3e0cd8f9e933aa0
asspoint/IWifiPasspointManager.aidl
asspoint/WifiPasspointCredential.aidl
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointDmTree.aidl
asspoint/WifiPasspointDmTree.java
asspoint/WifiPasspointInfo.aidl
asspoint/WifiPasspointInfo.java
asspoint/WifiPasspointManager.java
asspoint/WifiPasspointOsuProvider.aidl
asspoint/WifiPasspointOsuProvider.java
asspoint/WifiPasspointPolicy.aidl
asspoint/WifiPasspointPolicy.java
12eef9f18ad752847d4856f1d7841b3e0d329b48 25-Jan-2016 Mitchell Wills <mwills@google.com> Updates for gscan HAL updates in N
am: c90855d7a9

* commit 'c90855d7a9f3ebd300de4dad9842cd6771ff27d1':
Updates for gscan HAL updates in N
a0e3d62162e71fcf701edac84fddbf219bbaa45d 14-Jan-2016 Rubin Xu <rubinxu@google.com> API to set multiple CA certificates for WifiEnterpriseConfig

Support multiple CA certificates as trust anchors for server certs
when connecting to EAP networks. For the full feature, also requries
wpa_supplicant support, Wifi stack change to set up certificates and
aliases, and Wifi Setting UI tweak.

Bug: 22547958
Change-Id: I3c9f0e184632b79044a9e623ce0e7d9aaddd2ae3
ifiEnterpriseConfig.java
c90855d7a9f3ebd300de4dad9842cd6771ff27d1 19-Dec-2015 Mitchell Wills <mwills@google.com> Updates for gscan HAL updates in N

This will compile, but all new functionality may not work

Change-Id: I88f27f375121c6b27377b075e9fd6bfad7b05aa4
ifiScanner.java
9e717cbddb8f694a02128cec976ff366cad0cfa4 20-Jan-2016 xin He <xinhe@google.com> Merge "Phone reboots after connect-disconnect-reconnect to GoPro" into mm-wireless-dev
am: 77eb57976e

* commit '77eb57976e67c36b33d1e3ad17ec9f4033b09398':
Phone reboots after connect-disconnect-reconnect to GoPro
94e95746db3709074230b14c0f41520004f67789 20-Jan-2016 Jeremy Klein <jlklein@google.com> Merge "Expose WifiAp methods as @SystemApi."
b625377b1a9b324254fcde9928eade4473712486 06-Jan-2016 Jeremy Klein <jlklein@google.com> Expose WifiAp methods as @SystemApi.

GTS tests to follow shortly.

BUG: 22406002
Change-Id: I42883fa5e35a11b4b2d734f07b7d72f2ac0ec1f8
ifiConfiguration.java
ifiManager.java
90a3841994b40aeb1c3a7a6b78dd804e49eb5e13 20-Jan-2016 xinhe <xinhe@google.com> Phone reboots after connect-disconnect-reconnect to GoPro

Error is due to the wrong initialization on Disable
Reason String

BUG=26664811

Change-Id: Ie4ede26eb5654ef369d2d07cb393765ad1edac61
ifiConfiguration.java
045891e4bca8b9eb634c19b74d84d55c49fc80a7 10-Dec-2015 Prerepa Viswanadham <dham@google.com> WLAN wake reason accounting from driver.

Cherry-picked from 46f5f53d2838ec6f265c168100e21a22f990a97d

Bug: 26572953
Change-Id: I58e0594682bf0f1d5746e9a2d8ec3091a5bf550f
ifiWakeReasonAndCounts.java
3da7357951a1981ecf40391e19ad8e53b45cb046 15-Jan-2016 Etan Cohen <etancohen@google.com> Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev
am: e540b64aaf

* commit 'e540b64aaf58460f7930a5e4937cee660215c948':
NAN: baseline NAN manager for discovery.
e540b64aaf58460f7930a5e4937cee660215c948 15-Jan-2016 Etan Cohen <etancohen@google.com> Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev
20d329b08df7d1a94e6caee781f09e812a79c913 29-Sep-2015 Etan Cohen <etancohen@google.com> NAN: baseline NAN manager for discovery.

Initial framework for user API (all @hide for now). Supports:
- NAN configuration
- Publish/Subscribe = Discovery
- Message passing
- Notifications

Bug: 26216681
Change-Id: I72e467756a02f7b80c52fae916b9a47c8174af42
ifiManager.java
an/ConfigRequest.aidl
an/ConfigRequest.java
an/IWifiNanEventListener.aidl
an/IWifiNanManager.aidl
an/IWifiNanSessionListener.aidl
an/PublishData.aidl
an/PublishData.java
an/PublishSettings.aidl
an/PublishSettings.java
an/SubscribeData.aidl
an/SubscribeData.java
an/SubscribeSettings.aidl
an/SubscribeSettings.java
an/TlvBufferUtils.java
an/WifiNanEventListener.java
an/WifiNanManager.java
an/WifiNanPublishSession.java
an/WifiNanSession.java
an/WifiNanSessionListener.java
an/WifiNanSubscribeSession.java
f9bf6da6cd0666897f4b56cf0e6dee3c55243273 14-Jan-2016 Bartosz Fabianowski <bartfab@google.com> Add WifiConfiguration.shared flag
am: 6fb0756d2f

* commit '6fb0756d2f59d70507919350f6192718b5d3f630':
Add WifiConfiguration.shared flag
6fb0756d2f59d70507919350f6192718b5d3f630 12-Jan-2016 Bartosz Fabianowski <bartfab@google.com> Add WifiConfiguration.shared flag

* Add boolean WifiConfiguration.shared, which indicates whether a network
is shared (visible to and usable by all users) or private (visible to
and usable only by the user who created it)
* Extend WifiConfiguration.configKey(...) so that when two users create
private configurations for the same network, their configurationKeys
will be different.
* Make AccessPoint.matches(...) take into account the shared flag

BUG=25600871

Change-Id: I4a4335fa3b4b4f850e16748583a29ab66992ddc8
ifiConfiguration.java
f7705c3ed6ac2e6d787f91c65feb003a8b749ceb 01-Dec-2015 xinhe <xinhe@google.com> Initial codes for Quality network selection

In this change list, the old WifiAutojoin module is
refactored initially. The old WifiAutojoinController is
replaced with a new WifiQualifiedNetworkSelector.
WifiConfiguration, WifiConfigureStore and
WifiStateMachine have been modified accordingly. The new
network selection logic is refactored with a more clear
and deterministci one. To refer to thedescribed in
details, in "Quality Network Selection and Connectivity
Scan Management in N". The link of the document is:
https://docs.google.com/document/d
/1JPTa2NEk-PgjCJ16fIrR6ohV-kDKveDlYDOeiMCB2_c

cherry-picked from 8d106780b6a638552749e54e169fc72537d4bccc
and make changes on WiFiConfigurationSerializer.java since
it is not on mm-wireless-dev
Bug:26012244
Change-Id: I44e454544b630b891c9a58a18b5a028edcce580f
ifiConfiguration.java
8d106780b6a638552749e54e169fc72537d4bccc 01-Dec-2015 xinhe <xinhe@google.com> Initial codes for Quality network selection [DO NOT MERGE]

In this change list, the old WifiAutojoin module is
refactored initially. The old WifiAutojoinController is
replaced with a new WifiQualifiedNetworkSelector.
WifiConfiguration, WifiConfigureStore and
WifiStateMachine have been modified accordingly. The new
network selection logic is refactored with a more clear
and deterministci one. To refer to thedescribed in
details, in "Quality Network Selection and Connectivity
Scan Management in N". The link of the document is:
https://docs.google.com/document/d
/1JPTa2NEk-PgjCJ16fIrR6ohV-kDKveDlYDOeiMCB2_c

Bug:26012244

Change-Id: I3df124c110e458e3b6bc29466b9046748d79582a
ifiConfiguration.java
a47f684020b00c003ee45c64907903652092dc16 30-Dec-2015 Randy Pan <zpan@google.com> resolve merge conflicts of 8c79fe5dc4 to master.

Change-Id: Id331e763f64ecbf8ed23764a487e32b94c4d3c09
8c79fe5dc446be817aff439b49b64ef20a60bdcd 17-Dec-2015 Randy Pan <zpan@google.com> Correct WiFi exponential back off scan

Correct the comments for exponential back off scan. Only binary
exponential back off scan is supported.

Updated the API doc. A couple of un-related fields which were
not updated get updated as well.

Bug: 26236392
Change-Id: I5668092f393b564aa40904ed609a51aa16890614
ifiScanner.java
46f5f53d2838ec6f265c168100e21a22f990a97d 10-Dec-2015 Prerepa Viswanadham <dham@google.com> WLAN wake reason accounting from driver.

Change-Id: I58e0594682bf0f1d5746e9a2d8ec3091a5bf550f
ifiWakeReasonAndCounts.java
e6748ce31f18782b7a47a5b2eb251efd83e7b609 12-Dec-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Use Arrays.toString

Fix a couple of cases where Arrays.toString should be used.

Bug: 19797138
Change-Id: I905fc79e63face9b26975320a92086c732bf6316
2p/nsd/WifiP2pServiceResponse.java
075698c35f2bf8bb4b3c3060b67514b72fd1b862 16-Nov-2015 Mitchell Wills <mwills@google.com> DO NOT MERGE Expose gscan exponential backoff API

Will be ignored until scan scheduling supports it

Cherry-picked from 2564d9a4efb2f3a44dac5ae1e5e437e5355d19cf
Change-Id: I9d392080e6ec8dfa9a998f6c04ec37f9c6dad0b2
ifiScanner.java
21c748d091f014a6733fa4c17df36ea4dc40564f 28-Jul-2015 Mitchell Wills <mwills@google.com> DO NOT MERGE Moved Wifi InformationElement parsing to a common utility class

Cherry-picked from 97c46ef28632f275665384d64cf42b698ca70255
Change-Id: Iaa0cfc39ac4df375f80f01cf59eb5f0d0ae61879
canResult.java
a23840e7a4a43209bfb8ca3d9ecebe44660b1115 07-Oct-2015 Mitchell Wills <mwills@google.com> DO NOT MERGE Remove old APIs that are no longer used/implemented

All of these APIs were hidden and are no longer used by anyone. The scan
APIs are being replaced by the new WifiScanner API

Cherry-picked from 88d93cd68a32e7110f9328ff522226126c7e493e
Change-Id: I36ffef137d0620263278e5ef46bbc498a39c588f
atchedScanResult.aidl
atchedScanResult.java
atchedScanSettings.aidl
atchedScanSettings.java
WifiManager.aidl
ifiChannel.aidl
ifiManager.java
5374e36bb5ad5ffbe80f1a05e00356ee949c4d2e 25-Aug-2015 Mitchell Wills <mwills@google.com> DO NOT MERGE Add missing ap threshold config for hotlists

Cherry-picked from ff4fdceafe4646998629587248fff22400f44765
Change-Id: I9e31e72560840ea57ab191e820acf8e3faf00c36
ifiScanner.java
d1ed98f83367fd3b2cc02be039fbc4edb7c29afa 18-Aug-2015 Mitchell Wills <mwills@google.com> DO NOT MERGE Check if link stats are supported when reporting activity info

Cherry-picked from 9a568e6f2f69cc923bbfc1ffb07c2f194acdb981
Bug: 23286362
Change-Id: I42c91d488acd39341a6874797788d3e5357f0270
ifiManager.java
255d41dce1194b2edf3c4c1a5ece7f764fd40707 23-Sep-2015 Jan Nordqvist <jannq@google.com> DO NOT MERGE Hotspot 2.0 relase 2 first cut.

CP mods to take a URL as a parameter, and new ScanInfo object.

Cherry-picked from 52eb29f0822f129f2b14bacec23dd492f2260ac0
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
WifiManager.aidl
canInfo.aidl
canInfo.java
ifiManager.java
b8c7badbb5b0cf2d101ddfabdcf7c95135965eea 01-Dec-2015 Jeremy Klein <jlklein@google.com> Mark WIFI_AP_STATE_CHANGED_ACTION and extras @SystemApi.

These will be used by Magic Tether within GmsCore.

Change-Id: I06691e69d256d0400d16a7bb63e3406fada7b5f1
ifiManager.java
568f4de11a87308cbcb888083f02818a8290a7d7 03-Dec-2015 Neil Fuller <nfuller@google.com> Merge "Fix @code escapes"
71fbb81b14958b80fe55738607740c6630e4e9da 30-Nov-2015 Neil Fuller <nfuller@google.com> Fix @code escapes

The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
ifiManager.java
2p/package.html
ackage.html
0d3d1f825f399c62f2ba236b53bef17581e03a16 02-Dec-2015 Sungsoo Lim <sungsoo@google.com> Fixed typos: when when

Change-Id: I80c0b8817dcbed45071e42d9ffa88bae52a93a81
ifiManager.java
a31ebbc439364a4993e79fd385cf6373408a42fe 24-Nov-2015 Makoto Onuki <omakoto@google.com> Add DO API to get wifi mac address

Bug 25496044

Change-Id: Ib1f0ce4ca10951edcfaa0aa79ae5c2d142a74599
ifiInfo.java
48241ddc581204938b5bad327f30ffef7fa76a71 17-Nov-2015 Mitchell Wills <mwills@google.com> Merge "Expose gscan exponential backoff API"
2564d9a4efb2f3a44dac5ae1e5e437e5355d19cf 16-Nov-2015 Mitchell Wills <mwills@google.com> Expose gscan exponential backoff API

Will be ignored until scan scheduling supports it

Change-Id: I9d392080e6ec8dfa9a998f6c04ec37f9c6dad0b2
ifiScanner.java
ae64b185fca97c23f72d0e71f63d9511f6dd06ce 11-Nov-2015 Paul Stewart <pstew@google.com> WifiEnterpriseConfiguration: Do not print credentials in toString

BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
ifiEnterpriseConfig.java
593474e07493d1aed0e1dbbf3157d1acfcc04852 31-Oct-2015 Mitchell Wills <mwills@google.com> Merge "Remove old APIs that are no longer used/implemented"
10794f0b5f27080cc7e3a83ce200b900d628a270 30-Oct-2015 Mitchell Wills <mwills@google.com> Merge "Moved Wifi InformationElement parsing to a common utility class"
e9c56b8f8feb54b28506ff61254f39e604bce830 24-Oct-2015 Mitchell Wills <mwills@google.com> Merge "Check if link stats are supported when reporting activity info"
19242993d228f29ac9f65fef1ceb2d124043118d 24-Oct-2015 Mitchell Wills <mwills@google.com> Merge "Add missing ap threshold config for hotlists"
2452e54de65312163b1073fc699a432e2dd2a704 21-Oct-2015 xinhe <xinhe@google.com> [DO NOT MERGE] EAP-TLS PMKID mismatch error

b/24253154

Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e
ifiEnterpriseConfig.java
97c46ef28632f275665384d64cf42b698ca70255 28-Jul-2015 Mitchell Wills <mwills@google.com> Moved Wifi InformationElement parsing to a common utility class

Change-Id: Iaa0cfc39ac4df375f80f01cf59eb5f0d0ae61879
canResult.java
88d93cd68a32e7110f9328ff522226126c7e493e 07-Oct-2015 Mitchell Wills <mwills@google.com> Remove old APIs that are no longer used/implemented

All of these APIs were hidden and are no longer used by anyone. The scan
APIs are being replaced by the new WifiScanner API

Change-Id: I36ffef137d0620263278e5ef46bbc498a39c588f
atchedScanResult.aidl
atchedScanResult.java
atchedScanSettings.aidl
atchedScanSettings.java
WifiManager.aidl
ifiChannel.aidl
ifiManager.java
52eb29f0822f129f2b14bacec23dd492f2260ac0 23-Sep-2015 Jan Nordqvist <jannq@google.com> Hotspot 2.0 relase 2 first cut.

CP mods to take a URL as a parameter, and new ScanInfo object.

Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
WifiManager.aidl
canInfo.aidl
canInfo.java
ifiManager.java
ff4fdceafe4646998629587248fff22400f44765 25-Aug-2015 Mitchell Wills <mwills@google.com> Add missing ap threshold config for hotlists

Change-Id: I9e31e72560840ea57ab191e820acf8e3faf00c36
ifiScanner.java
9a568e6f2f69cc923bbfc1ffb07c2f194acdb981 18-Aug-2015 Mitchell Wills <mwills@google.com> Check if link stats are supported when reporting activity info

Bug: 23286362
Change-Id: I42c91d488acd39341a6874797788d3e5357f0270
ifiManager.java
54cea23479b6c44c5ac40b4f34edf29df311bb91 05-Aug-2015 xin He <xinhe@google.com> Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev
f6d3d148d50562823e5f953ddd9c084266ac4c1b 01-Aug-2015 Jan Nordqvist <jannq@google.com> Added logging in a few error paths for wifi config installation.

Bug: 22790527
Change-Id: I71b298b98da098f647f52886c3c3a7456cb24d51
ifiManager.java
f2c01041fe1a5e8b51970774c4ac6f04eb5967f0 31-Jul-2015 xinhe <xinhe@google.com> Boot loop when SSID has non UTF-8 character in the name

b/22773761

Change-Id: I44c8a19c11470ab16baf27eef252097690ef5d4a
canResult.java
ifiScanner.java
959991b957fb58672aef17c46a7662941f138e19 23-Jul-2015 Fyodor Kupolov <fkupolov@google.com> Fixed a typo

Change-Id: I85d75429baed3263c04e747eb374c66177c064f5
ifiManager.java
e8de06d2feb6680df15c1473fb72efb214ced744 10-Jul-2015 xinhe <xinhe@google.com> Add API to turn OFF "best network selection" feature

b/14990268

Change-Id: I0231a9f0fae2baee50138e1cfa5416612ff41d6d
WifiManager.aidl
ifiManager.java
e0ec6ba9cb6494df147479316c24defb167ab2b1 14-Jul-2015 xinhe <xinhe@google.com> Need to disable 5GHz bands for WiFi tethering in Japan

b/22396383

Change-Id: I61efef1babaab756425e6958843dfb9ad47b46cd
ifiManager.java
cb13aebfec313a3433ed0f53cc2e3b6dbaf888d0 20-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Check location permission/appop in getScanResults

Return an empty list if the calling process has no location permission/appop

Bug: 21852542
Change-Id: Ifb9c5eb06c3fc7136a7f8251ac152234585f5b67
ifiManager.java
dd14bad82d46c565de923daf74cd5fbc993f8537 01-Jul-2015 Vinit Deshpande <vinitd@google.com> Merge "correctly print wificonfiguration creation and update time" into mnc-dev
edbedd28b6aa10c266e627a9609b1c538479f03b 01-Jul-2015 Pierre Vandwalle <vandwalle@google.com> correctly print wificonfiguration creation and update time

Change-Id: I1c4abf9bed86cddea3592f0604def1a7727b73fc
ifiConfiguration.java
7226c8f95b5971af2710c8d2f8a8b6f2210e2420 30-Jun-2015 Vinit Deshpande <vinitd@google.com> More API review feedback

ScanResult now hides all flags and their values, only methods
are public; and converted roaming consortium to an array of longs
instead of Longs.

Bug: 22179306

Change-Id: I644110dbddd5fa7a7109ac16051845fcc4c4e9d1
canResult.java
ifiConfiguration.java
c7a38ef8405443648688a7950378ac4e4ebb3ae5 25-Jun-2015 Shirish Kalele <kalele@google.com> Mark a connection as a Wifi Assistant connection based on the
ephemeral flag in WifiInfo.
Add this private field to WifiInfo.

Change-Id: Ic815b87a24e8272faa6e9e820b8fa55224af882a
ifiInfo.java
a0d929e505432a8c84f3899696c910db16bd73bf 13-Jun-2015 Vinit Deshpande <vinitd@google.com> Address API review comments

Added a flags field in ScanResult; along with flag
values and methods to read them.

Changed types of passpoint related fields.

Bug: 21342042
Bug: 21572290
Bug: 21343777

Change-Id: I413960de88b387853d11b9e10f92665e9c06a81b
canResult.java
ifiConfiguration.java
ifiEnterpriseConfig.java
ifiManager.java
d258d7a86e3e2f8e0d2d573c27a2b3c6a7975df1 10-Jun-2015 Pierre Vandwalle <vandwalle@google.com> make sure wifi link stats are reset

Change-Id: I8687594eccea1e3d8b99450da5230442cdbd1a86
(cherry picked from commit 5fc9e14077c3bec51d0a93a5edeeade396d77d15)
ifiInfo.java
ced1a6599042826a3bf678871d6b8a9e7187e973 16-Jun-2015 Pierre Vandwalle <vandwalle@google.com> add creation/update time to WifiConfiguration

Change-Id: Iaace83e752c8aa7d740a3dfad42cd8bba80a7a08
ifiConfiguration.java
8a351373881e2e11c2636d6f9445f9df9accbace 16-Jun-2015 Adam Lesinski <adamlesinski@google.com> Bluetooth energy: fix overflow in calculation

Use longs instead of ints, because the energy values can get pretty
high.

Change-Id: I43e696ad9e5965c2e616b11920db5bfae5db1671
ifiActivityEnergyInfo.java
3e9a1775d67b7fe1ee7c6f07f586dde391785e7f 06-Jun-2015 Wei Wang <weiwa@google.com> Fail sanity check when BSSID is empty in RTT request

Bug:21636405
Change-Id: I33a8e7e42dd428c1ff598bef3aed44060c6dd396
ttManager.java
ed10e29cfbd62a2925177684d94c212dfb2a620c 04-Jun-2015 Vinit Deshpande <vinitd@google.com> Remove trivial GScan logs

These helped once; but now this is just noise. Also
given that GMSCore starts/stops scans many times it is
taking too much of log real estate.

Bug: 20416721

Change-Id: I965ed919afbac56e123e8d019be84d7d33abf3f9
ifiScanner.java
d49288352908e8cbc9a001e13df2eb35e78deb1a 02-Jun-2015 Jan Nordqvist <jannq@google.com> Cleaned out "isValid" from WifiConfig.

Change-Id: I028615e55700aa92889670297f1130397eba650f
(cherry picked from commit c50315e014efded84b8f1981602951011816360b)
ifiConfiguration.java
597492c963725366b320678786d241e7f654e347 27-May-2015 Soonil Nagarkar <sooniln@google.com> Add NO_BATCH flag to WifiScanner

Change-Id: Idd521f724684986ff84306327d42b810f7b30245
(cherry picked from commit b9e6d98c6c0a05ebfc73a14d1ac2a47d58290241)
ifiScanner.java
5ddc65b9860b7ef39a0921bcbca3cbc50abe3a2c 21-May-2015 Pierre Vandwalle <vandwalle@google.com> fix annoying typo

Change-Id: Ic8411d622755ee168da6495d2e86201fb3c1154f
(cherry picked from commit c4ea0369dd01ec1ed53b5c8930d2f3831d793442)
ifiConfiguration.java
81815e0858256a0fde19204441ad669049dc2bf0 19-May-2015 xinhe <xinhe@google.com> Rename HandlerThread name in RttManager
The sHandlerThread name in RttManager is called "WifiScanner".
It should be changed to RTTManager

Bug:21299667
Change-Id: I545d0810544295fb39d95b5c3d8fe89c3b8fc073
(cherry picked from commit 4451685c7fd16c9a9a77791bb5bc9e4f23f1b6e8)
ttManager.java
29ad7c7000393751a0ab0e1a17912db7866d4ff8 20-May-2015 Vinit Deshpande <vinitd@google.com> Indicate failed scans with EXTRA_RESULTS_UPDATED

This flag indicates if scan was successful and results were
updated. It will be set to false if a scan is not performed
(intentionally) or if it failed to produce any results.

Bug: 20642015

Change-Id: I06a1fdd684932db68891ee28d5a049980f483f0f
ifiManager.java
f7b541ff749ec8336852ba781f1fa6f7abb3f6df 19-May-2015 Svet Ganov <svetoslavganov@google.com> Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev
408abf7f1bec3253675d0225300d7ee39481d286 13-May-2015 Svet Ganov <svetoslavganov@google.com> Do not report WiFi and Bluetooth MAC addresses - framework.

As a part of the new runtime permissions work we are limiting
the PII apps can access. BT and WiFi MAC addresses are PII and
based on our research there is no valid use case for app dev
to get these addresses aside of user tracking which we are
trying to limit.

bug:21078858

Change-Id: Ib48223b272c0fd4f5c36acc889d4f44df204b309
ifiInfo.java
358673e275ed065fadb04c1722ac458e6c617a89 11-May-2015 Pierre Vandwalle <vandwalle@google.com> hal based pno and lazy roam implementation

cherry-picked from mirror-m-wireless-internal-release
3655257 - hal based pno and lazy roam implementation

Change-Id: Ib58d40796c896a6d0dad856e0cb86c716c7aee7f
WifiManager.aidl
ifiManager.java
a3b9a2240ef25ae7c7fae557be150f43fdd5f675 14-May-2015 Vinit Deshpande <vinitd@google.com> Merge "fix null pointer crash" into mnc-dev
20903b392b78e5f3dc0ce8b782154adc77853468 09-May-2015 Pierre Vandwalle <vandwalle@google.com> fix null pointer crash

(cherry-picked from mirror-m-wireless-internal-release
216d8c3 fix null pointer crash)

Bug: 20232584

Change-Id: I7c46e372bc8f3a54b0428ef56c034eb2c79133ea
ifiManager.java
976f044b2b3eff2ce968e3ea59022414180c268d 13-May-2015 Lorenzo Colitti <lorenzo@google.com> Only activate the wifi alternate reality hack for KK and lower

Currently, the hack is activated for apps that target L or lower.
Per discussion, we should activate the hack only for apps that
target KK or lower. Apps that target L or above must instead use
the appropriate multinetwork APIs to deal with this situation.

Bug: 20081183
Change-Id: I29e1989e7a07aaabc10f604c20ecdc0d8b5366a3
ifiManager.java
d1808401ca3bfd6b6b9a975c1e739b194d18f849 05-May-2015 Prerepa Viswanadham <dham@google.com> Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
Merge commit 'b6f59f4' into master_merge
Merge commit 'f6db0ce' into master_merge
Merge commit '17455a3' into master_merge
Merge commit 'b4d5b32' into master_merge
Merge commit 'a1a2fa7' into master_merge
Merge commit '8dfdb98' into master_merge
Merge commit 'eba66c3' into master_merge
7094d22022c8e0c6ad71920b101434dded8a276e 02-May-2015 Sanket Padawe <sanketpadawe@google.com> Adding "Connected, no Internet" string in Wifi nw summary.

Bug: 17380953
Change-Id: I9664bcbf33832fe722e7d2b3125939287ee98098
WifiManager.aidl
ifiManager.java
b6f9da0b7f26b50163461a767cafcd8014328742 01-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '17455a3' into master_merge
e20b8ad4c43e671b5115cfefe5740b7d9462b685 24-Apr-2015 Jan Nordqvist <jannq@google.com> Changed logging tag.

Change-Id: I9a916305910c65425ffe7ea8d5a29dba0ee9a8da
ifiConfiguration.java
ebc5ced56e474e48777194fd6ca349a6cedb1e6f 23-Apr-2015 xinhe <xinhe@google.com> No Permission check for WiFi RTT

Bug:19918231
Change-Id: I98aea756cc15683596096e46da48efe0737ae1d1
ttManager.java
f9465fb6d215358233edc7679918aadf3d6e5b48 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '7e5e791' into merge2

Change-Id: Ie4889e3448b905afe5c0df453da96df0735e60d7
644f41368f9eddd475fa9c5dddc7ceac5722a3a8 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '4cb5d80' into merge2
4de834eb636a46db223417a03646751eb06efe66 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit 'c91bc62' into merge2
94f2c27aca75bf96a5600ada7395f34cc2df42ce 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '7f61051' into merge2
fa57c489f621cd10add639cf7df59f630a7f41a4 22-Apr-2015 Lorenzo Colitti <lorenzo@google.com> Allow apps with ACCESS_WIFI_STATE to listen for wifi networks

The compatibility measure introduced in bug 20081183 for apps
that connect to a Wi-Fi network without Internet access and then
expect to be able to use that network requires that such apps
register a NetworkCallback so that their WifiManager can pin them
to whatever wifi Network connects.

Currently, registering the callback requires ACCESS_NETWORK_STATE
and the app may not have that permission. Allow registering wifi
(only) callbacks if the app has ACCESS_WIFI_STATE.

If the app does not have ACCESS_WIFI_STATE (unlikely, since
CHANGE_WIFI_STATE is not very useful without ACCESS_WIFI_STATE),
then don't enable the compatibility measure.

Bug: 20081183
Bug: 20423580
Change-Id: Iad328d30c2d170dead883868fece3d922da68f6f
ifiManager.java
85607190c958d89999edad95c765ce6b2d4449c8 22-Apr-2015 Vinit Deshpande <vinitd@google.com> Turn of WifiScanner's debug logging

Bug: 20416721
Change-Id: I48051dbc0bb6e58279ea5ca5dce90d837f1df4e6
ifiScanner.java
7e5e791d22e76eb576fd5cf6dd5437b8050b0438 22-Apr-2015 xinhe <xinhe@google.com> Fix build error on API

Change-Id: Id7024feb6baf8c6cc607702b3ac90dfbd3d483ba
ifiConfiguration.java
b99d4144c41bd8b7c57487c94325fdb2f6fef177 21-Apr-2015 xinhe <xinhe@google.com> Merge "set softAP band selection API hidden 20460598" into m-wireless-dev
023158cbbc378bc924ad2e55b773c4e8fcb44ec8 21-Apr-2015 xinhe <xinhe@google.com> set softAP band selection API hidden
20460598

Change-Id: I2a13961896bacf0bd67c387dc1983dc45ca0e52d
ttManager.java
ifiConfiguration.java
37f0820d6c23aa92a2b591327a734916131cb69a 17-Apr-2015 Jan Nordqvist <jannq@google.com> Changed [gs]etDomSubjectMatch to [gs]etDomainSubjectMatch.

Change-Id: I42a69320a95a96522500375e3e101c159ee5bf1b
ifiEnterpriseConfig.java
f1fb39763d87dabe254b6ed64ac8f20145035bc0 03-Apr-2015 Stuart Scott <stuartscott@google.com> Move factoryReset to service and protect.

bug:16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
WifiManager.aidl
ifiManager.java
c91bc62f2bdca18c0ed96a740cbaa0383ea2860a 17-Apr-2015 Jan Nordqvist <jannq@google.com> Added setDomSuffixMatch for AAA cert suffix matching.

Change-Id: I112399d2ce3d940ccf4451477b3b4edb93010b42
ifiEnterpriseConfig.java
6593256e785df3f16e57097d529fcb26f92b55e3 10-Apr-2015 Jan Nordqvist <jannq@google.com> A few minor fixes for EAP-TLS.

Change-Id: I807d44d1bd84b929d21df402542c4b6f1f646b30
ifiConfiguration.java
7f61051949875edf4bfbf29b00ad6f2ede61d6cb 17-Apr-2015 xinhe <xinhe@google.com> enable RTT capability exception

Bug:20299517
Change-Id: I497cc08b90f720d1717e107f93f75fda4212c8a8
ttManager.java
fc197d392300116b47c87dcc87453c3465ca6ce2 15-Apr-2015 Pierre Vandwalle <vandwalle@google.com> add disconnected scan parameter, add bytes[] container to scanResults

Change-Id: I201b52064ea764ddd406c25c86f41887029ff225
canResult.java
1022dde719ca430f062f9e628574d70ae1320677 08-Apr-2015 Lorenzo Colitti <lorenzo@google.com> Pin a process to wifi when it calls enableNetwork(..., true)

Bug: 20081183
Change-Id: I12bbda1061bbebeb4d0844d0b0d7f51237645958
ifiManager.java
1248dd3c296a94457d5864b7f433335f32490b50 06-Apr-2015 Lorenzo Colitti <lorenzo@google.com> Add a noInternetAccessExpected boolean to WifiConfiguration.

This will be set if the user explicitly confirms a connection to
a Wi-Fi network without Internet access and checks the "don't ask
again" box.

Bug: 20081183
Change-Id: I75223ae41dbf0d3a827527a0a131855d8eb4c515
ifiConfiguration.java
1ac50cb32c08388540f53833c04a02f13fed0824 06-Apr-2015 Lorenzo Colitti <lorenzo@google.com> Add an UNKNOWN_UID constant to WifiConfiguration.

This value will be used to indicate that one of the various UIDs
tracked stored in the WifiConfiguration is unknown. Currently the
code just uses "-1" everywhere for this purpose; a constant is
clearer.

Bug: 20081183
Change-Id: Id865da9284f642587eed11f67685e5b12ce772c2
ifiConfiguration.java
127217a340681c6cae53667d9514631c5812dd16 15-Apr-2015 Pierre Vandwalle <vandwalle@google.com> add disconnected scan parameter, add bytes[] container to scanResults

Change-Id: I201b52064ea764ddd406c25c86f41887029ff225
canResult.java
57bf2a8a38e929f00f3323cf97a8ea7a9af900ce 11-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge commit 'e593d0a' into merge_work

Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
220951a6d0a408313256d0a9078c8ae8d8321c03 11-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge commit 'b2ff415' into merge_work

Change-Id: I4f9c662112fc49e4f94315d3c69860607be3bc1e
0326f585e15e56fb49c19ebb77e5a0fc8a7c4a62 08-Apr-2015 Vinit Deshpande <vinitd@google.com> Merge "API for config app." into m-wireless-dev
e9b056f8860296a08f93f4b7d2a0971c746c227b 30-Mar-2015 Jan Nordqvist <jannq@google.com> API for config app.

Change-Id: Icda0ac1b081a08f438645ccf3667b5b81cb5e244
WifiManager.aidl
ifiConfiguration.java
ifiManager.java
d5351e7b602f8b69de8b89e343aeb71b5b5d879a 25-Mar-2015 xinhe <xinhe@google.com> RTT framework interface update

Bug:19917983
Change-Id: I1c89c4c583923137983243814e35c8981f6db54a
ttManager.java
b4d90fca0ec461c24cd38e4b7d1990447ad047a1 04-Apr-2015 Vinit Deshpande <vinitd@google.com> Implement 'Available via Passpoint' feature

This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'

Change-Id: Ib4de956f2ea29709d0212fbcb392815644800e78
WifiManager.aidl
ifiManager.java
36711e0e2cee9181a328718a349454dbd834f4e2 02-Apr-2015 Etan Cohen <etancohen@google.com> Merge changes from topic 'mwd-merge-040115'

* changes:
Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
Merge commit 'd91f193' into merge2
Merge commit '5718646' into merge2
Merge commit '7aa0345' into merge2
eb864d4000dacad94d5135a10ed7bdeb29f31881 01-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit 'd91f193' into merge2
6f6c781cca66cabc1f06be368a6dfedceb88ed0e 27-Mar-2015 Vinit Deshpande <vinitd@google.com> Remove scanResultCache from WifiConfiguration

This is in preparation to use ScanDetail - which is a superset
of ScanResult - in wifi stack. There are no external users of
scanResultCache; so it can be safely removed.

Also fixed a javadoc comment for getPlmn()

Change-Id: I7c49532664ffe2e3e5e134bfcd42615d5999d02f
ifiConfiguration.java
ifiEnterpriseConfig.java
984dc850b4caeb4470e52bce773935be5305cf8e 30-Mar-2015 Stuart Scott <stuartscott@google.com> Move reset network settings into framework.

bug: 16161518
Change-Id: Ic3b537ebd09d1b9723feff9dcc96e20fda05a94f
ifiManager.java
4b6bd8d36b093d36d9ae80b43e95049c259d7319 19-Mar-2015 Adam Lesinski <adamlesinski@google.com> Retrieve WiFi info outside of BatteryStatsImpl

In order to not deadlock the system, we need to retrieve
WiFi energy info outside of the BatteryStats lock. We do this,
then pass that data down to BatteryStatsImpl to process.

b/19729960

Change-Id: Ib8beba1d5ac81d89144d502c4b688d0a88c5b102
ifiActivityEnergyInfo.java
adf9e95ecc5d0867adf1dc2d7adcac958457b98e 11-Dec-2014 Jean-Michel Bachot <jean-michel.bachot@intel.com> EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods

EAP-AKA' is a new hidden method

Change-Id: Ic103b25ad58807eebd5e0f8eefe3bfc02397aedc
Signed-off-by: Jean-Michel Bachot <jean-michel.bachot@intel.com>
Signed-off-by: Abdelmajid MLAYEH <abdelmajidx.mlayeh@intel.com>
ifiEnterpriseConfig.java
ddfd35dbf9aab0ff196e1d7046ebe6bcd972c7a5 23-Mar-2015 Pierre Vandwalle <vandwalle@google.com> add wifi config for power calculation

Change-Id: Ic312ffeb299d199547cc75bc6977140f8e6e5f7b
ifiActivityEnergyInfo.java
ifiManager.java
4209a28270a70016ee5ee6cae3dc96d6df0ade26 24-Mar-2015 Prerepa Viswanadham <dham@google.com> Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
3105289af34b99bf27128a433663f71549b41b6d 19-Mar-2015 Jan Nordqvist <jannq@google.com> Merge "More fixes to get passpoint working" into m-wireless-dev
af3f1c995cd9ee5b4ffe2aed42522121cd8736c7 19-Mar-2015 Pierre Vandwalle <vandwalle@google.com> Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev
automerge: 7c39808

* commit '7c398083319bbd1ad51d23cb307cfc3ac9091c3a':
export API to disable autojoin scan initial implementation
ad25bb89251c0552cfbc6c254853c79b7d9c121a 19-Mar-2015 Vinit Deshpande <vinitd@google.com> More fixes to get passpoint working

Change-Id: If8639bb0fd3bdaad7ee09217a9152c1695cb9354
ifiConfiguration.java
9954faa70d4172617b8b77743d1fdd599e2e6277 13-Mar-2015 xinhe <xinhe@google.com> Change rtt Framework interface

Bug:19735392
Change-Id: I0886d3c0e40a6dd5477c81a5df5dbc2746942ec3
RttManager.aidl
ttManager.aidl
ttManager.java
2522c830a3ad3ae2ca7f675f13fafab8835d4f0c 13-Mar-2015 Vinit Deshpande <vinitd@google.com> Fix scan results to hold passpoint data

Change-Id: I8ab75ec49226a59b04de6463de596cc9f5f6d800
canResult.java
ifiConfiguration.java
asspoint/WifiPasspointManager.java
04444427d0f3421fc9791842bdce834ffed448cc 12-Mar-2015 Vinit Deshpande <vinitd@google.com> Improve passpoint configuration validation

Change-Id: I717242b2f8b2e7d0f84c3a7c74c4672289387151
ifiConfiguration.java
88dadfaa3be35e5d49c3424398f3244b187b6ed5 16-Mar-2015 Robert Greenwalt <rgreenwalt@google.com> am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"

* commit '7cff91ea67f89ca963a822daa1b68674bfc0e587':
Frameworks/base: Fix a hashCode implementation
34a7d13a65ab5734cd35c00863aa06ce54858ff0 15-Mar-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Fix a hashCode implementation

Equals uses Arrays.equals. That means two responses are equal if
the content of the data arrays is equal. By convention, the hash
code of those objects should agree. In that case one cannot use
hashCode on the array (which is the identity hash code).

Change-Id: Icce8e2e71e9142421f5dac8a0ee8a211623fb704
2p/nsd/WifiP2pServiceResponse.java
fd67bf63e629c217a4f6f0b2e54f0a5965bba4ed 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "add 2 side RTT support on scan"

merged from goog/mirror-m-wireless-internal-release
6e58424 add 2 side RTT support on scan
811576251485f7ab8bb88a9b97d6b417bfa8f764 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Passpoint API - Take 1"

merged from goog/mirror-m-wireless-internal-release
b21d248 Passpoint API - Take 1
9e535b86eed3671ce997aee024ad76038e30f78b 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Do not provide 5GHz option for softap if there is no country code available"

merged from goog/mirror-m-wireless-internal-release
b938c0e Do not provide 5GHz option for softap if there is no country code available
a86f0741c794ffb00490320220219b864a5f90e3 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "get channel list from driver for SoftAP channel selection"

merged from goog/mirror-m-wireless-internal-release
18ae1d2 get channel list from driver for SoftAP channel selection
fc19120fc7c91ae1295ec80f59327d0e44f8b58a 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Revert "Initial Passpoint code.""

merged from goog/mirror-m-wireless-internal-release
5d7768f Revert "Initial Passpoint code."
53f87384484689dce0bcc14d9de258f299e5a075 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Initial Passpoint code."

merged from goog/mirror-m-wireless-internal-release
2eba02a Initial Passpoint code.
b35f4efe159829852ea4a4b58b21448b306c37d9 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "set softAP on a specified band, including both 2.4 and 5 GHz band"

merged from goog/mirror-m-wireless-internal-release
a0be0fb set softAP on a specified band, including both 2.4 and 5 GHz band

Change-Id: I8f2514dfc35fafddc52d9244a093f2924697b748
5914caff06f9790238bea0536acfbf533cee9046 13-Mar-2015 Pierre Vandwalle <vandwalle@google.com> export API to disable autojoin scan initial implementation

Change-Id: I28e268dd8b859a3a22c3d6f699216bbd7124af26
WifiManager.aidl
ifiManager.java
046ac5e6f78a80eef0bd22551b2d0011e96109e1 07-Mar-2015 Vinit Deshpande <vinitd@google.com> Few changes to make API check happy [DO NOT MERGE]

These changes are made to make the API check in mwd-staging
happy. It doesn't look like they are needed in master branch;
so marking them as DO NOT MERGE.

Change-Id: I45363165b6a8ffe896cf9a31c0b3cb410aa69cba
ifiScanner.java
0019e53e11b5387dbb037db52ff4833fe58cc651 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "add 2 side RTT support on scan"

merged from partner/m-wireless-wifi-dev
6e58424 add 2 side RTT support on scan
d2585f3050f749e471d79abb0dd54bd20445de05 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Passpoint API - Take 1"

merged from partner/m-wireless-wifi-dev
b21d248 Passpoint API - Take 1
e95944300eccf78a871fbfaf0545c7550ab424a5 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Do not provide 5GHz option for softap if there is no country code available"

merged from partner/m-wireless-wifi-dev
b938c0e Do not provide 5GHz option for softap if there is no country code available
14a2008f63367a68235ae1602ef2e17eb4a2c053 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Introduce onLost event on bssid hotlist [DO NOT MERGE]"

merged from partner/m-wireless-wifi-dev
ab325cb Introduce onLost event on bssid hotlist [DO NOT MERGE]
3cb5e4d72f4a22251b8fae253e0ccae38a5e70da 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "get channel list from driver for SoftAP channel selection"

merged from partner/m-wireless-wifi-dev
18ae1d2 get channel list from driver for SoftAP channel selection
76f9aceecfba5459bcad4c4f144ddca93383d713 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Revert "Initial Passpoint code.""

merged from partner/m-wireless-wifi-dev
5d7768f Revert "Initial Passpoint code."
29267b6dd601a3ed168da0865426fde457ad57aa 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Initial Passpoint code."

merged from partner/m-wireless-wifi-dev
2eba02a Initial Passpoint code.
b4499afde5cb4fe9e7c168af60d003e2c7df40a1 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "set softAP on a specified band, including both 2.4 and 5 GHz band"

merged from partner/m-wireless-wifi-dev
a0be0fb set softAP on a specified band, including both 2.4 and 5 GHz band
1aa4dcee03f75df4f96ac9d3653503e0ae027117 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Bring in passpoint code [DO NOT MERGE]"

merged from partner/m-wireless-wifi-dev
7dd2f6b Bring in passpoint code [DO NOT MERGE]
472cca08eb42fc198cf70ac327567c941960ea17 10-Mar-2015 Vinit Deshpande <vinitd@google.com> am "New Additions to WifiScanner APIs [DO NOT MERGE]"

merged from partner/m-wireless-wifi-dev
f45acfe New Additions to WifiScanner APIs [DO NOT MERGE]
488caeb70293b7c70e9ce128fc002a0666340fb0 09-Mar-2015 Adam Lesinski <adamlesinski@google.com> Change WiFi and Bluetooth ActivityEnergyInfo classes

Have them take an elapsed time millis timestamp instead
of having the constructor call System.currentTimeMillis.

Change-Id: Ic9ca8f92347c336beee8ebcc3407de2c1e5b4073
ifiActivityEnergyInfo.java
6e58424f5b052531a724a54629f00915ad3edada 02-Mar-2015 xinhe <xinhe@google.com> add 2 side RTT support on scan

Bug:19533713
Change-Id: I6b7a32aae1a038eb2941f5564d03a4a0286d5bf3
canResult.java
ifiScanner.java
08c7116ab9cd04ad6dd3c04aa1017237e7f409ac 28-Feb-2015 John Spurlock <jspurlock@google.com> Remove unused imports in frameworks/base.

Change-Id: I031443de83f93eb57a98863001826671b18f3b17
ifiConfiguration.java
ifiLinkLayerStats.java
ifiNetworkConnectionStatistics.java
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointDmTree.java
asspoint/WifiPasspointPolicy.java
a357b5adf0a73318ddff782d570aa6bc1631b1b7 26-Feb-2015 xinhe <xinhe@google.com> Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev
c4423a5f0a6f2689975df054114dd05577e3599e 25-Feb-2015 Vinit Deshpande <vinitd@google.com> Merge "Passpoint API - Take 1" into m-wireless-wifi-dev
b21d2489c1bd330e39f4489c7f221ebb4dffc283 02-Feb-2015 Vinit Deshpande <vinitd@google.com> Passpoint API - Take 1

Added some common fields to WifiConfigurations; which
should be used with WifiEnterpriseConfig. The network
information is saved in a file.

Change-Id: Ica2069900dfc373e14792cbe81a185586e2954cc
ifiConfiguration.java
ifiEnterpriseConfig.java
b938c0e2036d28df24ec626fc8ed7e277248b9a6 24-Feb-2015 xinhe <xinhe@google.com> Do not provide 5GHz option for softap if there is no country code available

Bug:19414134
Change-Id: I88da5c3d547522263394403c97147baabae45394
WifiManager.aidl
ifiManager.java
ab325cbcc88311a4d38348b7efda8961d399d26b 12-Aug-2014 Vinit Deshpande <vinitd@google.com> Introduce onLost event on bssid hotlist [DO NOT MERGE]

Change-Id: I84c3174398fea9a1456fb007586c2c559dd3fe4d
ifiScanner.java
18ae1d22077e1cd8ed71b1e74d14a3a2c4e50a62 05-Feb-2015 xinhe <xinhe@google.com> get channel list from driver for SoftAP channel selection

Instead of hard coding the available channel list, we should
get channel list from driver

Bug:19237543
Change-Id: Id2ec689273407f54709cb034d6ba666f91da51c0
ifiConfiguration.java
5d7768ff5ec406f76baacd12a9d6c100a5d22ec3 04-Feb-2015 Vinit Deshpande <vinitd@google.com> Revert "Initial Passpoint code."

This reverts commit 2eba02a11234c9cfa6c597effb4f32349826cee4.

Change-Id: I11da074b8d8990fc01faac3586fd3488f76af326
nqp/ANQPElement.java
nqp/ANQPFactory.java
nqp/CapabilityListElement.java
nqp/CivicLocationElement.java
nqp/Constants.java
nqp/DomainNameElement.java
nqp/EmergencyNumberElement.java
nqp/GEOLocationElement.java
nqp/GenericBlobElement.java
nqp/GenericStringElement.java
nqp/HSCapabilityListElement.java
nqp/HSConnectionCapabilityElement.java
nqp/HSFriendlyNameElement.java
nqp/HSIconFileElement.java
nqp/HSOsuProvidersElement.java
nqp/HSWanMetricsElement.java
nqp/I18Name.java
nqp/IPAddressTypeAvailabilityElement.java
nqp/IconInfo.java
nqp/NAIRealmData.java
nqp/NAIRealmElement.java
nqp/NetworkAuthenticationTypeElement.java
nqp/OSUProvider.java
nqp/RoamingConsortiumElement.java
nqp/ThreeGPPNetworkElement.java
nqp/VenueNameElement.java
nqp/eap/AuthParam.java
nqp/eap/Credential.java
nqp/eap/EAP.java
nqp/eap/EAPMethod.java
nqp/eap/ExpandedEAPMethod.java
nqp/eap/InnerAuthEAP.java
nqp/eap/NonEAPInnerAuth.java
nqp/eap/VendorSpecificAuth.java
otspot2/ANQPData.java
otspot2/NetworkInfo.java
otspot2/NetworkKey.java
otspot2/PasspointMatch.java
otspot2/SelectionManager.java
otspot2/pps/DomainMatcher.java
otspot2/pps/HomeSP.java
2eba02a11234c9cfa6c597effb4f32349826cee4 22-Jan-2015 Jan Nordqvist <jannq@google.com> Initial Passpoint code.

Change-Id: Ie4800b408d979c31c5cebef7d4a60a9a040d7200
nqp/ANQPElement.java
nqp/ANQPFactory.java
nqp/CapabilityListElement.java
nqp/CivicLocationElement.java
nqp/Constants.java
nqp/DomainNameElement.java
nqp/EmergencyNumberElement.java
nqp/GEOLocationElement.java
nqp/GenericBlobElement.java
nqp/GenericStringElement.java
nqp/HSCapabilityListElement.java
nqp/HSConnectionCapabilityElement.java
nqp/HSFriendlyNameElement.java
nqp/HSIconFileElement.java
nqp/HSOsuProvidersElement.java
nqp/HSWanMetricsElement.java
nqp/I18Name.java
nqp/IPAddressTypeAvailabilityElement.java
nqp/IconInfo.java
nqp/NAIRealmData.java
nqp/NAIRealmElement.java
nqp/NetworkAuthenticationTypeElement.java
nqp/OSUProvider.java
nqp/RoamingConsortiumElement.java
nqp/ThreeGPPNetworkElement.java
nqp/VenueNameElement.java
nqp/eap/AuthParam.java
nqp/eap/Credential.java
nqp/eap/EAP.java
nqp/eap/EAPMethod.java
nqp/eap/ExpandedEAPMethod.java
nqp/eap/InnerAuthEAP.java
nqp/eap/NonEAPInnerAuth.java
nqp/eap/VendorSpecificAuth.java
otspot2/ANQPData.java
otspot2/NetworkInfo.java
otspot2/NetworkKey.java
otspot2/PasspointMatch.java
otspot2/SelectionManager.java
otspot2/pps/DomainMatcher.java
otspot2/pps/HomeSP.java
b53d1a2794e59d5b02d5578528f76691fe723087 29-Jan-2015 vandwalle <vandwalle@google.com> Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839 automerge: 0a22d43
automerge: 7e553a0

* commit '7e553a06a0506529563c6a0920e0de2a0d48cedc':
aggressively blacklist WifiConfiguration for the purpose of switching network
7e553a06a0506529563c6a0920e0de2a0d48cedc 29-Jan-2015 vandwalle <vandwalle@google.com> Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839
automerge: 0a22d43

* commit '0a22d43c9143475c889ce54f0de6261e8857ab9d':
aggressively blacklist WifiConfiguration for the purpose of switching network
8650c035609507340e3a66459cea16ef08cd03a6 11-Jan-2015 vandwalle <vandwalle@google.com> aggressively blacklist WifiConfiguration for the purpose of switching network

In cases where networks are not properly configured, WiFi might tries to repeatdly switch from one network to a bad network, or might try to roam and renew DHCP which can fail. In KK, WiFi autojoin would try other networks (by cycling to network it sees) and end up associated to a "good" network. In L release even thought WiFi might pick a good network it will still repeatedly try to switch to what it thinks is a better network and fail, thus annoying the user whose connection becomes unstable. This CL tries to remember networks that have seen multiple DHCP or auth failure in the past and for those networks it disable roaming temporarily. That is, if wifi is not associated to any network, it will tries to join a network aggressively, however if wifi is currently associated to a network, it will not try to switch to a new network if that new network has seen multiple failure in the past. The maximum blacklist time is set to 2 days for now.
An example of such situation is:
- user has multiple SSID at home, one of which is incorrectly configured with a wrong password
- broken DHCP situation (potentially: multiple servers on home network, broken implementation incorrecting NAK'ing DHCP requests but properly serving DHCP offer...)
Bug:18792931

Change-Id: I332a9cebdc19be2e00b455205d386fcffcb70b29
ifiConfiguration.java
08cbd3e156c08cf46e6a5f79f95010362ac86c37 16-Jan-2015 xinhe <xinhe@google.com> Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev
a0be0fb2709124a567f89114b1d8e80f74452edc 08-Jan-2015 xinhe <xinhe@google.com> set softAP on a specified band, including both 2.4 and 5 GHz band

Bug:18929692
Change-Id: I6109b477937b0ecab95f5a2b414f2bec9b30e1cd
ifiConfiguration.java
7dd2f6b57b5ef1f14eb55b7801a3d31729ad7a0a 02-Jan-2015 Vinit Deshpande <vinitd@google.com> Bring in passpoint code [DO NOT MERGE]

This change brings in all the passpoint code from master
to here - so that all development can be done with partners

Change-Id: I9185c35c69630ffb9b4313f973893996051075ed
canResult.java
asspoint/IWifiPasspointManager.aidl
asspoint/WifiPasspointCredential.aidl
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointDmTree.aidl
asspoint/WifiPasspointDmTree.java
asspoint/WifiPasspointInfo.aidl
asspoint/WifiPasspointInfo.java
asspoint/WifiPasspointManager.java
asspoint/WifiPasspointOsuProvider.aidl
asspoint/WifiPasspointOsuProvider.java
asspoint/WifiPasspointPolicy.aidl
asspoint/WifiPasspointPolicy.java
f45acfe0960f1182ed9d38d2acd78188de25b720 30-Oct-2014 Vinit Deshpande <vinitd@google.com> New Additions to WifiScanner APIs [DO NOT MERGE]

Added single shot scan, and maxScansToCache. Also fixed getScanResults()
to report scan results to listeners.

Bug: 18087596
Bug: 17694040
Bug: 18059273

Change-Id: Id623ab9ee2ab89c86a35082279331fa609016347
ifiScanner.java
1c9c3f4e9be1933edfc8de0b1e3c57f7e36a985a 18-Dec-2014 vandwalle <vandwalle@google.com> am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev
automerge: 67878bb

* commit '67878bb5ea8b4cc873a25ab577a94a8d6f122dc1':
add debug logs to confirm network flapping issue is fixed Bug:18706288
67878bb5ea8b4cc873a25ab577a94a8d6f122dc1 18-Dec-2014 vandwalle <vandwalle@google.com> am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev

* commit 'a3c187bc1f97dc098ff939cfe937a482a9bdf7fb':
add debug logs to confirm network flapping issue is fixed Bug:18706288
72e1d3f53826c2f19727e30e4b576a0e2d0e3728 16-Dec-2014 vandwalle <vandwalle@google.com> add debug logs to confirm network flapping issue is fixed
Bug:18706288

Change-Id: I59378faafbccfa58639d942c8b8e2e0e815261f4
ifiConfiguration.java
c4f389e1229a9d6d9813f54de5800fd0d0e3d0ad 30-Oct-2014 Vinit Deshpande <vinitd@google.com> New Additions to WifiScanner APIs

Added single shot scan, and maxScansToCache. Also fixed getScanResults()
to report scan results to listeners.

Bug: 18087596
Bug: 17694040
Bug: 18059273

Change-Id: I8a6da5426561e22e72d1e99c5537205b893077dd
ifiScanner.java
1265a98965aa582cbb7724beb00fb2f4ff56bb82 12-Aug-2014 Vinit Deshpande <vinitd@google.com> Introduce onLost event on bssid hotlist

Change-Id: I84c3174398fea9a1456fb007586c2c559dd3fe4d
ifiScanner.java
572ff423a75a1f19610b500645d9b14523abcde5 14-Dec-2014 Prem Kumar <premk@google.com> am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev
automerge: da6ebb4

* commit 'da6ebb4ee29fff8b5455cd8b779aaabc029cd3b5':
make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
da6ebb4ee29fff8b5455cd8b779aaabc029cd3b5 14-Dec-2014 Prem Kumar <premk@google.com> am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev

* commit 'fa205ffff292bcbc1c504491b7ca2a5ee1b7b547':
make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
53d1f0707323428edf9ec00da4ca98eeb1b5c092 10-Dec-2014 vandwalle <vandwalle@google.com> make sure wificonfiguration scan cache doesnt grow unbounded
Bug:18703749

Change-Id: I8e35d602a80b341668d9607db2da3ca6fdb970ae
ifiConfiguration.java
5d0bf5de0d334db6cbfb7d32fd3a5d31b2f7deee 09-Dec-2014 Jeff Davidson <jpd@google.com> am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

* commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59':
add disable Ephemeral Network API Bug:18525241
820ba1f96f5917db98df5b5d36cf5f4b32f50f59 08-Dec-2014 Jeff Davidson <jpd@google.com> am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

* commit '401ef259f3b2c8c87b02c9939c0599d6ad0f6f39':
add disable Ephemeral Network API Bug:18525241
93e4192c06a28f37bc1c16b280fbd22c735b5c92 04-Dec-2014 vandwalle <vandwalle@google.com> add disable Ephemeral Network API
Bug:18525241

Change-Id: I954c53c55c39f6c376b2bae3c7ac4d28246a7f5a
WifiManager.aidl
ifiManager.java
a7af2e8fb659c258c72b1a44bb2073c5cc70486c 26-Nov-2014 vandwalle <vandwalle@google.com> am f12fc2e1: am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev

* commit 'f12fc2e14ebcf14745de03963a621e36bda11232':
make startScan with worksource specific to location scans
f12fc2e14ebcf14745de03963a621e36bda11232 26-Nov-2014 vandwalle <vandwalle@google.com> am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev

* commit 'b6c9cbc57694fb7fbd903fa08d42a55bc729114d':
make startScan with worksource specific to location scans
da123a6726e7c64b3f19f74ed0eb02bb4398a989 22-Nov-2014 vandwalle <vandwalle@google.com> make startScan with worksource specific to location scans

Change-Id: Ia09dae3e334ef6fd11f2b468e78ad7c2c3cf55e9
WifiManager.aidl
ifiManager.java
33f97d8304ab8c78f42f49df368630e385ddcebc 19-Nov-2014 Vinit Deshpande <vinitd@google.com> am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev

* commit '77fe4c96b75550e5d22a294314b05beabd55e97a':
Fix WPS docs for LABEL method
77fe4c96b75550e5d22a294314b05beabd55e97a 19-Nov-2014 Vinit Deshpande <vinitd@google.com> am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev

* commit 'a34f3d30c6a7a4b8863175f009935c61ace42b4e':
Fix WPS docs for LABEL method
c3eb1556446c932b5674adc40af8ff9bfc3a1880 17-Nov-2014 Vinit Deshpande <vinitd@google.com> Fix WPS docs for LABEL method

Since we don't support LABEL method in startWps, document
it explicitly.

Bug: 18298388

Change-Id: I5d4c2475a68f1b41e5fc449c911b7b01b3b82fc4
ifiManager.java
8ffeda02d73ec3d39311e03b2a377e1ac9007f6b 12-Nov-2014 Wink Saville <wink@google.com> Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflict

Conflicts:
wifi/java/android/net/wifi/WifiConfiguration.java

Change-Id: If52be614cadf80955025097589f922072363e7ba
4d974fa94266fe0de3ddee6912309a926998624b 12-Nov-2014 vandwalle <vandwalle@google.com> Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 3f558e7
automerge: 39c5118

* commit '39c5118037b5f401217db0fa5ac934291f45e378':
dont blacklist wifi config that have had validated internet status in the past
ec3e9805dd7c527f961d1f2a14e5752b461186ca 08-Nov-2014 vandwalle <vandwalle@google.com> dont blacklist wifi config that have had validated internet status in the past

Change-Id: Iadb4e0e1beeb9e582b944e003470815a5a865652
ifiConfiguration.java
e40ea96f9725ea5d71e63979256fadfd2229c8e3 06-Nov-2014 Jeff Davidson <jpd@google.com> am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev

* commit 'a45e98974e571ca539436b295a98d513faa10d19':
Fix incorrect doc for WifiInfo#getSSID().
a45e98974e571ca539436b295a98d513faa10d19 06-Nov-2014 Jeff Davidson <jpd@google.com> am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev

* commit '8cae7f644c59f0200f1962abdfbc6001166a192c':
Fix incorrect doc for WifiInfo#getSSID().
f92fc1ca6541ab833e2f0fc09b57fb95294411c0 05-Nov-2014 Jeff Davidson <jpd@google.com> Fix incorrect doc for WifiInfo#getSSID().

This method will never return null. It may return "<unknown ssid>" if
no network is currently connected.

Change-Id: Iae09a6b2376e47c2d010f8d05750a16361510cca
ifiInfo.java
bc2ccb48d3cd4cb7a9c5fb798f15d21620cc03f1 15-Oct-2014 Jeff Davidson <jpd@google.com> am 1199a4c4: am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev

* commit '1199a4c436b4e08306c02f615360e233124bff55':
Don't drop WifiConfiguration's ephemeral bit on copy/parcel.
1199a4c436b4e08306c02f615360e233124bff55 15-Oct-2014 Jeff Davidson <jpd@google.com> am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev

* commit 'f2a598e445800c9209dc58ab0005ca466eb14679':
Don't drop WifiConfiguration's ephemeral bit on copy/parcel.
074c5b5b65295ee57c4223360604aba51479d783 15-Oct-2014 Jeff Davidson <jpd@google.com> Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev
0f422c6d8024fb682d2e30a77ae7cf9c9c456cff 08-Oct-2014 Primiano Tucci <primiano@google.com> resolved conflicts for merge of 28495b02 into master

Conflicts:
wifi/java/android/net/wifi/ScanResult.java

Change-Id: I86a4537d603cbf325e5e0bff715a442d9dc6b6db
73a648990f0e126af49af5be1049255019d33e12 08-Oct-2014 Primiano Tucci <primiano@google.com> Fix the "Fix broken merge of "handle bssid blacklist in case of dhcp failures""

The change Iad35fb8dc2ce14874ef7424c4be5648ca7ac916c (Fix broken merge of ...)
seem be a partial resolution of Iba13db478ed69976c37bd4882f59bf0cae2212e6: the
parcel ser/des lines are missing.
This is causing today a merge conflict (lmp-dev -> master) on a dependent
change (I89b4f5c05a1f64f9d1e8c407f62036efa0265043), which is confused by
the lack of the parcel ser/des lines.
I think this was a genuine mistakes. Readding these lines should make
the conflict go away and fix master.

Change-Id: I8499b9caeb1667f95727fdd18f318c5859a2321e
canResult.java
28495b02f21d208360acae09c57fbd146a53407b 08-Oct-2014 vandwalle <vandwalle@google.com> am b75369e2: am 7bbf867b: am 0c0c680d: am a741efd5: Merge "adding debug information to bug report for Bug:16751877" into lmp-dev

* commit 'b75369e22c4617371606571398f0faa0838f02ef':
adding debug information to bug report for Bug:16751877
63edd98d2eb744cc78dc3a3f8ec1ce7e6164d69d 07-Oct-2014 vandwalle <vandwalle@google.com> adding debug information to bug report for Bug:16751877

Change-Id: I9d417c20c6b6721933a4eb943c1305845005facf
canResult.java
ifiConfiguration.java
ifiInfo.java
8faf2a2a15853368a14babf935c156664b5f0b6c 07-Oct-2014 Jeff Davidson <jpd@google.com> Don't drop WifiConfiguration's ephemeral bit on copy/parcel.

Bug: 15892711
Change-Id: I4a027c99634a11d13bb3c8420ba959c201644689
ifiConfiguration.java
3041a9e07dc85151a96062f67abf2eb1b5ef25bb 04-Oct-2014 vandwalle <vandwalle@google.com> am 542cc240: am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev

* commit '542cc240b5bd68a728067f65cd8bc4d8f6473b83':
add millisecond timestamp to locallog
542cc240b5bd68a728067f65cd8bc4d8f6473b83 04-Oct-2014 vandwalle <vandwalle@google.com> am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev

* commit '88b927e258214a31342326d46f527528e5979f85':
add millisecond timestamp to locallog
c520aa89a33ddb7c065ef06bcd2d2dbf96e1f989 02-Oct-2014 vandwalle <vandwalle@google.com> add millisecond timestamp to locallog

Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
ifiConfiguration.java
fb223e848fee4fdd379f2f6190d51e877d02dca2 02-Oct-2014 Lorenzo Colitti <lorenzo@google.com> am 65d720b3: am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev

* commit '65d720b3fb766f88c8f76bfba0538d0185cc6d21':
Revert the configKey generation algorithm to what it was in K.
65d720b3fb766f88c8f76bfba0538d0185cc6d21 02-Oct-2014 Lorenzo Colitti <lorenzo@google.com> am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev

* commit '6245bd9e19639ec3f64cae4268b204f8bfa0c6c9':
Revert the configKey generation algorithm to what it was in K.
8e1e34a3f659f76bbbfce2a2a8bdd3f471bf707d 30-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Revert the configKey generation algorithm to what it was in K.

Bug: 17670914
Change-Id: Ibb2ea26ea28a38518caab7d1b45ae535a0eaf661
ifiConfiguration.java
c55cd103708493f9d45122236affbf08b49456f0 20-Sep-2014 Sky Faber <skyf@google.com> User wifi separation feature.

Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
ifiConfiguration.java
3e3857c4f5d277c69bcb0ff3a581a176f3a84bf8 22-Sep-2014 Sky Faber <skyf@google.com> Separate wifi AP added by applications.
-Add field for tracking user approval of application added networks.
-Add WifiConfig fields for creating/updating application name
-Add permission to allow system apps to modify any network

Bug: 16953082

Change-Id: I12943563ef714c4287e13488578f020d136d006d
ifiConfiguration.java
0561030490e418fcead83606249d8cfdc344a163 24-Sep-2014 Mike Lockwood <lockwood@google.com> Fix broken merge of "handle bssid blacklist in case of dhcp failures"

Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6

Conflicts:
wifi/java/android/net/wifi/ScanResult.java
canResult.java
ifiConfiguration.java
6933d61f2d502ccb4ff445c05927bf4a12dfe0b6 24-Sep-2014 vandwalle <vandwalle@google.com> am 9e22f280: am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev

* commit '9e22f2803c26626851f24db7c54fa68b85ca5e45':
handle bssid blacklist in case of dhcp failures
176a27f3abf18af18a1ad4012ca3eadbff12ba96 20-Sep-2014 vandwalle <vandwalle@google.com> handle bssid blacklist in case of dhcp failures

Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6
canResult.java
ifiConfiguration.java
2e88cecdb5641c75bd8ae03172157fc8a901b3e5 23-Sep-2014 Vinit Deshpande <vinitd@google.com> am ccafcfbc: am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev

* commit 'ccafcfbc63a0f7e279112b8ce717f7408ac3774d':
Fix documentation for Wifi ScanResult.timestamp
28a15a1fe09a74b32097833853dbeb3d77da18ac 23-Sep-2014 Vinit Deshpande <vinitd@google.com> am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev

* commit '6839bf68d8f557e7d31410a3f88f2e32a4f1a2b8':
Fix documentation for Wifi ScanResult.timestamp
02b115b2d8a889bcc04594802ffcbc880644012c 19-Sep-2014 Vinit Deshpande <vinitd@google.com> Fix documentation for Wifi ScanResult.timestamp

Bug: 14997906
Change-Id: Idfcf9ade905c7565cc1d59d15aa4362c1b597b72
canResult.java
58e5d5e4c62e94542f39b157d5130bcb8205eef1 15-Sep-2014 Prem Kumar <premk@google.com> am 27f19d75: am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev

* commit '27f19d75d3dd5e6c8524a8214fa768052c396849':
Allow creating EAP_TLS network without specifying Phase2.None
e2b32aff76c4ca8953163825f0806bc31bb0ce8a 15-Sep-2014 Prem Kumar <premk@google.com> am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev

* commit 'c3eea0ee551af36c4ad18e8b0f96e5e04bef270c':
Allow creating EAP_TLS network without specifying Phase2.None
97a0c45cf88ce88b3f40a0966d029871bb03f2ba 15-Sep-2014 Prem Kumar <premk@google.com> Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev
3d6e7eb89b496f7c1bade0bb405544214cab69c6 14-Sep-2014 vandwalle <vandwalle@google.com> am ffbae6e2: am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev

* commit 'ffbae6e26a354dceadd2f1c9a18dffd0b1151fe3':
make wifi cellular params configurable
397b30b1bdc67b1b26f52ecf439fa5561fc2fb3f 14-Sep-2014 vandwalle <vandwalle@google.com> am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev

* commit 'dfb82a243b00ced8f093b54a9ed51c06ab11d7ac':
make wifi cellular params configurable
2e93c38fa6fad224e56a45ff4244bdd538aec846 13-Sep-2014 vandwalle <vandwalle@google.com> make wifi cellular params configurable

Change-Id: Ia2a4ac3e11f2b0c7412f33496a655c5d5297ea0c
ifiConfiguration.java
26a98001ad3ec626f18fd57165ccc404f80d4e51 13-Sep-2014 Vinit Deshpande <vinitd@google.com> Allow creating EAP_TLS network without specifying Phase2.None

Phase2 isn't required for EAP_TLS networks, and it is possible
for a developer to miss it. We are requiring it for internal
book keeping - so this change just sets Phase2 to 'None' when
EAP_TLS is set on the configuration.

Bug: 17043082
Change-Id: I5a8e0a3a236d0dfd1295584de55d5b9a1b76b483
ifiEnterpriseConfig.java
a487843425ce2e16525f17e3243f2e38b1d1dc2a 13-Sep-2014 vandwalle <vandwalle@google.com> am 4ae83802: am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev

* commit '4ae83802fb462233a5caea9e94cc2692ea84a389':
various fixes:
f28489b81642bd879a72437e138e356aa05176c9 13-Sep-2014 vandwalle <vandwalle@google.com> am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev

* commit '8c8f56ca16fd9d28ea2c2bf1d4f2fe59dcb1a8a7':
various fixes:
94fe7e99d1e99a6bb351da48a8e17b1d61b0efdc 12-Sep-2014 vandwalle <vandwalle@google.com> various fixes:

- allow for making use of more aggressive initial autojoin attempt rssi thresholds
- create a blacklist due to missing identiy reason
- make autojoin parameters configurable

Change-Id: I385db83aab1da7918ff6935eb59a209b253d42e6
ifiConfiguration.java
37b26b4ceaff033eb020869cd86d3414aad2ada4 11-Sep-2014 vandwalle <vandwalle@google.com> am 0689adb0: am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev

* commit '0689adb05583357b213ec0ce491cdcd5a7080074':
make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
afc48850421a7a5e3b370d992250b9a0dd9b5f00 10-Sep-2014 vandwalle <vandwalle@google.com> am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev

* commit 'a5ef501abfec5b93486f59c1140dc5791433656d':
make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
e26bc8fda7b2d9dad3882ec3fb22739b80d5390f 10-Sep-2014 vandwalle <vandwalle@google.com> make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration

Change-Id: I5052f6a76bcd1f980ef558bff54ce1b172319743
ifiConfiguration.java
3120fb3d5eef5f862f2a9b4ca410f6fa23471ce8 10-Sep-2014 Vinit Deshpande <vinitd@google.com> am 9f593a21: am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev

* commit '9f593a217435b5639245917043696ed18b312856':
Secure access to WifiScanner
174538fff5d286af7a5e5016b01a066f67d28fa4 10-Sep-2014 Vinit Deshpande <vinitd@google.com> am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev

* commit 'b73e94b4173aca543ea506fbda70890311eba4d5':
Secure access to WifiScanner
a0000c6c3c0cccb99c86a41df02ea5770db70a21 10-Sep-2014 Vinit Deshpande <vinitd@google.com> Merge "Secure access to WifiScanner" into lmp-dev
43f6edae1b0b92e1656d87a60723f2f71c9c06cc 09-Sep-2014 Vinit Deshpande <vinitd@google.com> am 80adb33a: am 33e1b95c: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev

* commit '80adb33a9f07b7f6bfa55165deb3f35d1fd3411e':
Implement getAvailableChannels
bb90cfffc12cd759333698ac24590b8a05fd1f2a 09-Sep-2014 Vinit Deshpande <vinitd@google.com> am 33e1b95c: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev

* commit '33e1b95ca08f8ecc114665f3eed3e9c71355310c':
Implement getAvailableChannels
592b95901ef3fa7248bb9b79d8ea9ce3df9628bc 09-Sep-2014 Vinit Deshpande <vinitd@google.com> Merge "Implement getAvailableChannels" into lmp-dev
4b9975671f148e05830704f54e6fdc2f1d1d9d2e 09-Sep-2014 Vinit Deshpande <vinitd@google.com> Secure access to WifiScanner

This change implements access control for WifiScanner. It is now
available to only those apps that have CONNECTIVITY_INTERNAL permissions.

Bug: 15088601
Change-Id: I6acc13079b6dac6f190644b6d1a270c271cc679f
ifiScanner.java
bc189d8a40d045397b64f0a85f824764fb0cc637 08-Sep-2014 vandwalle <vandwalle@google.com> am e1677497: am 344ddea4: am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be l

* commit 'e16774976b9c09ca3992f21199e012d8a2dacaed':
add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change
8828537f61979a90bf8a48d041cecab3e8b7b598 08-Sep-2014 vandwalle <vandwalle@google.com> am 344ddea4: am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be looked at with

* commit '344ddea49fb61cde1d9161f3cd010428c137dd6b':
add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change
448e208b0a1b2a4cec22b636afd28d58f8785c2e 05-Sep-2014 vandwalle <vandwalle@google.com> add more info to WifiConfiguration.toString:
- add the noInternetAccess field
- add stats about user triggered wifi state disabling requests
- Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change

Bug:17348200

Change-Id: Ic956e11e7d61faf472a7332f84a46a746922455a
ifiConfiguration.java
15f89078784d44006f7ed0c0f34a5e3fbc3d840c 06-Sep-2014 Vinit Deshpande <vinitd@google.com> Implement getAvailableChannels

This API allows finding channels by band, so scanning services
can find out which channels to use.

Bug: 16652660
Change-Id: I690825333988a336efa3fc8886297e5b8baf8e1d
WifiScanner.aidl
ifiScanner.java
4ec0cf048ad52027bd1773f436aa01268ce5c18b 04-Sep-2014 David Christie <dnchrist@google.com> am 1fc17b58: am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev

* commit '1fc17b58efa68b7128fd5b1cfa3355c353aaff4e':
Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
25fb15035b21833e882c736281b126c925827e45 04-Sep-2014 David Christie <dnchrist@google.com> am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev

* commit 'd3a78eff9d1a34f4638ddfdb6b1f3519b10426b7':
Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
e7baf5afc07127854e5791d93f05e6b46633bc47 04-Sep-2014 David Christie <dnchrist@google.com> Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev
c20b795cf05b48fe5e024c19dab9c7e4b18cd10f 04-Sep-2014 David Christie <dnchrist@google.com> Add @SystemApi annotations to methods used by GmsCore.
-Currently these methods are called using reflection for location.
Bug: 17371392
Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
ifiManager.java
3df10a64b92be8150d005ec5c578fe9cee677f78 03-Sep-2014 Vinit Deshpande <vinitd@google.com> am 21790061: am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev

* commit '217900618fedda7ddc447b2fb861d0458cf8ed0e':
Address API Council feedback for WifiAdapter/WPS APIs
f0f4058c6a1d1b41f90e94593ebf306f9e2b8b89 03-Sep-2014 Vinit Deshpande <vinitd@google.com> am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev

* commit 'f4b970e5fc0204334ff3990ccb47f6323fd68ee7':
Address API Council feedback for WifiAdapter/WPS APIs
73f5d16ad5c61320deac161fe23e00a8a4aed772 29-Aug-2014 Vinit Deshpande <vinitd@google.com> Address API Council feedback for WifiAdapter/WPS APIs

This change addresses concerns from the API review. Things that
are fixed are -

1. WifiAdapter is removed, until we have 'real' support for it
2. All the methods from WifiAdapter are moved to WifiManager
3. Changed WPSListener API names to be onFailed/onSucceeded et al
4. Removed ActionListener from WPS APIs, they now take WpsListener

Bug: 16403303
Bug: 17115004

Change-Id: Ia721dd95041acb3e50d16690319e3320fe550ff5
WifiManager.aidl
ifiAdapter.aidl
ifiAdapter.java
ifiManager.java
8c1f0b3fafcecbdf5197dceb87e22fe2758c4dd6 27-Aug-2014 vandwalle <vandwalle@google.com> am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev

* commit 'f7c9ffc381b4f8001caacfdd82386f0b060e4dd1':
fix ScanResult read from parcel, this function was broken and causes wifi settings to crash
b1dce0220bec5d81dca0aac645d84854ef4324cb 27-Aug-2014 vandwalle <vandwalle@google.com> fix ScanResult read from parcel, this function was broken and causes wifi settings to crash

Bug: 17293156

Change-Id: I5f7a8141adb21103e98913c9802d8364164eaba7
canResult.java
fb9cf903fb39e65f17bc1abfba4c432b49f7f96f 27-Aug-2014 vandwalle <vandwalle@google.com> am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev

* commit '39b53f3c10e1e758c2bcc27ffd9f4c1076d13539':
remove passpoint - DO NOT MERGE
7aea15a08eaf22f0e42adf9d93d45705660a787d 26-Aug-2014 vandwalle <vandwalle@google.com> Merge "remove passpoint - DO NOT MERGE" into lmp-dev
0f5734dda8ae7442c3c2a013726bbb20111001c6 26-Aug-2014 vandwalle <vandwalle@google.com> am 362448d4: am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-dev

* commit '362448d4b91704503340e9f751d26b88706c2057':
add radio stats to link layer
10d3d97b56814687f05b737bb6b84ea0903a624d 26-Aug-2014 vandwalle <vandwalle@google.com> am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-dev

* commit 'dbf54ec22d1215cdf9991b79ecef8b17b9e58fe0':
add radio stats to link layer
808079bd27fc1fa7fb834567d70546b6c68684d2 25-Aug-2014 vandwalle <vandwalle@google.com> remove passpoint - DO NOT MERGE

This CL is dependent on I3d2a230b0362520b9f1b2bc3792260116971e106

Change-Id: I1a0d655877d9368d833d62e231797af4b2560862
canResult.java
asspoint/IWifiPasspointManager.aidl
asspoint/WifiPasspointCredential.aidl
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointDmTree.aidl
asspoint/WifiPasspointDmTree.java
asspoint/WifiPasspointInfo.aidl
asspoint/WifiPasspointInfo.java
asspoint/WifiPasspointManager.java
asspoint/WifiPasspointOsuProvider.aidl
asspoint/WifiPasspointOsuProvider.java
asspoint/WifiPasspointPolicy.aidl
asspoint/WifiPasspointPolicy.java
b928a3802bfcd3aeed592906ddb3e14c653b213c 07-Aug-2014 vandwalle <vandwalle@google.com> add radio stats to link layer

Bug:15563188

Change-Id: I3d2a230b0362520b9f1b2bc3792260116971e106
WifiManager.aidl
ifiActivityEnergyInfo.aidl
ifiActivityEnergyInfo.java
ifiAdapter.aidl
ifiAdapter.java
ifiLinkLayerStats.java
ifiManager.java
5223cc6167f79e9f2f2dcc3c461a63e79154883a 21-Aug-2014 Wenchao Tong <tongwenchao@google.com> am de1bc6cb: am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev

* commit 'de1bc6cb3ecdfab5e7f42bc9f865f39a1ef0c01e':
Revert "Annotate @SystemApi on some WifiManager methods."
0a3bd24f4cc57c1b2679c82a0532103e54b36d07 21-Aug-2014 Wenchao Tong <tongwenchao@google.com> am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev

* commit 'f654d5b210419e90ba674c73a20a3bcfa9f394e6':
Revert "Annotate @SystemApi on some WifiManager methods."
ddd0986311196f389c9b88147620129ec788886e 21-Aug-2014 Wenchao Tong <tongwenchao@google.com> Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev
82615a6ba2942855d96ea08834779813d5fec206 21-Aug-2014 vandwalle <vandwalle@google.com> am fad9e3a0: am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev

* commit 'fad9e3a007593ce9ace3b426e1b037e3b73d6357':
per bssid blacklist
51978596852914d049bf021bc07219eadddf6363 21-Aug-2014 vandwalle <vandwalle@google.com> am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev

* commit '01c23ffbf8f50e4a8d3889c05ebb459a82e0a930':
per bssid blacklist
beec21522de893edad1217059d1e3700a775593f 21-Aug-2014 vandwalle <vandwalle@google.com> Merge "per bssid blacklist" into lmp-dev
99d853f212365524b59027a551eb73bedf85bc04 21-Aug-2014 Jeff Davidson <jpd@google.com> am 00fde029: am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev

* commit '00fde029a5d9ec74dd5e47e29f53c5885779e4ac':
Improve documentation of ScanResult and WifiInfo.
2cfe5359eb0a86891954bb53a534d40dfadc689b 21-Aug-2014 Jeff Davidson <jpd@google.com> am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev

* commit '5e3130d63a745ad6cd3ccf535845128ae744d092':
Improve documentation of ScanResult and WifiInfo.
cd8e0416687c00a1e8eff525be0925a3f00c08bb 21-Aug-2014 Wenchao Tong <tongwenchao@google.com> Revert "Annotate @SystemApi on some WifiManager methods."

This reverts commit 041bcc22bd21f84358e5b2102e3a919bcdd99b81.

Bug: 17134034
Change-Id: I1ebcdd9b4c56e5c93fd5667699c8971e8c6e5452
ifiManager.java
612519db40db1bad7597ab207f14c9b5b5524a93 20-Aug-2014 vandwalle <vandwalle@google.com> per bssid blacklist

Bug: 16823537

This CL is dependent on Iff32fae2cd67343e63046d58d75fa1e10d9775d0

Change-Id: Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3
canResult.java
833dcd4bea5cadccaa55f9a06942bb36d01d73ac 20-Aug-2014 Jeff Davidson <jpd@google.com> Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev
ccb019d04e0a34109addc270583e3b7a8cfdde4d 20-Aug-2014 vandwalle <vandwalle@google.com> am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev

* commit '3a7bbbff1e526dce660fc1d08113167134402b75':
remove passpoint, except ANQP - DO NOT MERGE
da3475dba70965908bbef269a004a71433963532 20-Aug-2014 vandwalle <vandwalle@google.com> Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev
b413f19d8f634bafdee1ba4e0d7f5d070158bcca 20-Aug-2014 Wenchao Tong <tongwenchao@google.com> am 143817b4: am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev

* commit '143817b4302baa8f42f2f2a489a75b429735a3eb':
Annotate @SystemApi on some WifiManager methods.
459fcb6c318a4c45c9729e7e19c150201b281595 20-Aug-2014 Wenchao Tong <tongwenchao@google.com> am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev

* commit '3e76a3aa299c6c7abde43ed5e9b780eb1dd13b8d':
Annotate @SystemApi on some WifiManager methods.
aa740d3fdcf2fb67d6051fee1e72b87f7ca249a6 19-Aug-2014 Lorenzo Colitti <lorenzo@google.com> am 5eb792fc: am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev

* commit '5eb792fcdebc92a872c17a54310db3de60e7d620':
Stop using LinkProperties for static configuration.
56d4c18e2f5f4780b900f30c3f8cc52a25714d54 19-Aug-2014 Lorenzo Colitti <lorenzo@google.com> am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev

* commit '45b565ffdbd2962c336f385d80d6516cd1cc489a':
Stop using LinkProperties for static configuration.
4d114920719d4bdf6c014a9475178bbd0eba905d 19-Aug-2014 Wenchao Tong <tongwenchao@google.com> Annotate @SystemApi on some WifiManager methods.

Bug: 17112931
Change-Id: I5980bc46bc1f16316caecd7fcc6cd771b8ca6cdf
ifiManager.java
36ecb30b870c445521587a5538d0c4dadda8f45c 20-Aug-2014 Wenchao Tong <tongwenchao@google.com> Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev
1575d9060535df8ee017608fbb2023f097f692e3 19-Aug-2014 vandwalle <vandwalle@google.com> remove passpoint, except ANQP - DO NOT MERGE

This CL is dependend on Ic3ae7269f0ca11cec6b7aea5143499e88ecc7149

Change-Id: Ic533d1820c470bf2370a92452b37515ef7458f45
asspoint/IWifiPasspointManager.aidl
74eea2aa3817c9e869abc20c892ce74af4c16c4e 18-Aug-2014 Elliott Hughes <enh@google.com> am 61520b2e: am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"

* commit '61520b2ef9c766a75bced02b4cc65dc66414d234':
WifiP2pWfdInfo set device type bugfix
c97de79ad268fdc867b618c4a91dc76ce9b61e2b 18-Aug-2014 Elliott Hughes <enh@google.com> am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"

* commit '400ec1b938ddc8da367c594105bfaa7485c80564':
WifiP2pWfdInfo set device type bugfix
400ec1b938ddc8da367c594105bfaa7485c80564 18-Aug-2014 Elliott Hughes <enh@google.com> am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"

* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd':
WifiP2pWfdInfo set device type bugfix
0a82e80073e193725a9d4c84a93db8a04b2456b9 30-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Stop using LinkProperties for static configuration.

LinkProperties can represent way more complicated configurations
than what we can actually apply to interfaces. This makes it
error-prone to use it to represent static configuration, both
when trying to apply configuration coming from LinkProperties
and when trying to save configuration from current
LinkProperties.

Instead, move static configuration (IPv4 only, since we don't
support static IPv6 configuration) into a separate
StaticIpConfiguration class.

Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
ifiConfiguration.java
8b3b81000c6fe7e6e5bab0f3e2d24022d3eaaea8 16-Aug-2014 Grigoriy Kraynov <kraynov@mgpro.ru> WifiP2pWfdInfo set device type bugfix

Change-Id: I37a53aed80574e78c80dc4a4192bd8cc4320de9d
Signed-off-by: Grigoriy Kraynov <kraynov@mgpro.ru>
2p/WifiP2pWfdInfo.java
d7d06fed4063bf6e0c5f6c0fd216ac229d5b6ace 15-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev

* commit 'bcdd58c572a81477a14c8a670739066783492bc3':
Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
7db442e2bdf8b64efe34c1c8905668f38708ee8e 15-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> am 08390bf9: am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev

* commit '08390bf9cb75bfb2987a480166d02f672afa8ba1':
Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
a93fb72f85bbb12ede4d26f26fdc56457c0f8ee2 15-Aug-2014 Narayan Kamath <narayan@google.com> am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev

* commit '2b83dc1a695cec37f372945e6440fa6d9fd598c3':
Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
55083f240b828d9bb07fc4ec98ea846e171d6ece 15-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings""

* commit 'a6e86ddfd0e5eccd8657c18554cfd6ccd86608f3':
Revert "Revert "Update Trusted Credentials screen in settings""
1e7bc0def8c62b91d3eb985a51bec54063ce83f5 15-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> Revert "Revert "Update Trusted Credentials screen in settings""

This reverts commit 0f0de0bdd021bad5f85fdb0399a4ea91a1611e25.

Change-Id: Ia3d0907e3d7c2ec42d64e45f60e3dfaffb932c3d
asspoint/WifiPasspointManager.java
f8d72cc14f70f5af13342c4c7b107a8ab60dfe23 15-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""

This reverts commit 87efe74e092236c372d3b6909009641123aa416a.

This should be fine now with all the dependency CLs +2-ed


Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
asspoint/WifiPasspointManager.java
f75aadc028f2e79541a269bf2c74dcb3482e2ec7 15-Aug-2014 Narayan Kamath <narayan@google.com> Revert "Revert "Revert "Update Trusted Credentials screen in settings"""

This reverts commit 19c8ce291e89a9ef1442a20e1feab421b11536d7.

Change-Id: Ie5a5571127311e0a29f314c0566e779cfe940b53
asspoint/WifiPasspointManager.java
3291de8f6c8bc7ffa5992a2a5a5c2cf8bb0adf4b 15-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""

This reverts commit c9249c69813c6fb889d71d84583c67ae2942e6de.

Change-Id: I5504fddaf7b18efb73cd6c76678b3b39ce9b0229
asspoint/WifiPasspointManager.java
e4ce619880e831992b005c17dfabb7800994d0c7 09-Aug-2014 Jeff Davidson <jpd@google.com> Improve documentation of ScanResult and WifiInfo.

Valid dBm ranges should *not* be mentioned in the documentation.
Manufacturers should be able to produce devices which can detect
signal strengths with arbitrary sensitivity rather than being forced
to restrict strengths to a certain range.

Adds a reference to WifiManager.calculateSignalLevel(), an
often-useful method to convert these RSSI values into an absolute
signal level that can be displayed to a user as the signal strength.

Bug: 13731529
Change-Id: I0aae85a6d8bc48ffddd1927d816a1dfbf5230f7e
canResult.java
ifiInfo.java
c216c473eb50e16ab6c6361bd0c9232d5bfaeb39 07-Aug-2014 Chelsea Derrick <chelsead@google.com> Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]"

This reverts commit 41158d90a69cae2a9c4ced0e04f235e8cfef5259.

Bug: 16871063
Change-Id: I93623be92f2de41789b16827867f3f95bf0480c5
ifiManager.java
88992bc90c874eb0eb159b3ea37659a8b83bbee0 11-Aug-2014 Vinit Deshpande <vinitd@google.com> Merge "Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE" into lmp-dev
894651bab56bfcfa2ecb35dfac262f2590ff483d 08-Aug-2014 Vinit Deshpande <vinitd@google.com> Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE

This is unhiding some unwanted changes too; but we'll fix that later.

Change-Id: I35343815e99aafbec8e4ef4d0707499fb6219457
canResult.java
asspoint/WifiPasspointInfo.java
asspoint/WifiPasspointManager.java
c8505931420dd9a76acf940a56b31354cd0105b0 22-Jul-2014 Vinit Deshpande <vinitd@google.com> Support EAP-SIM and EAP-AKA

This change un-hides constants for these two methods and
also un-hides RADIUS/AAA FQDN field to allow creating
Passpoint release 1 credentials.

Change-Id: Ia3501017dc1f5c0b4932bb45e1e9c5bf7262d7fe
ifiConfiguration.java
ifiEnterpriseConfig.java
75e3ad631c922341dee6200145f8a627a6adbead 08-Aug-2014 Chelsea Derrick <chelsead@google.com> Merge "Unhide broadcasts for WiFi network changes." into lmp-dev
e75c0b8e3becd9f875679a5240f3b1e26d089a3f 07-Aug-2014 Chelsea Derrick <chelsead@google.com> Unhide broadcasts for WiFi network changes.

This change will fulfill the same role as ag/487624, which unhid other broadcast
constants (and is being rolled back). We can leverage the existing broadcasts
in this CL rather than introducing new ones. They just need to be exposed.

Bug: 16871063
Change-Id: I91462851c8016ed962cdafa54e9ec938d52c84b6
ifiManager.java
db0c15dd67c4a5491348d1417b38a427b9fec1f3 08-Aug-2014 Vinit Deshpande <vinitd@google.com> Read/Write numBssidsPerScan in ParcelableScanResults

Setting the value has no effect because it was lost in marshalling
across binder interface.

Bug: 16826305
Change-Id: I5b308441608e0b7fc159fc249a16aec3728bac82
ifiScanner.java
138b324d5db09cff27e43c8ee3614def01630013 07-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev
678e3ecc937c00969830700dffb42fb1ee232f7c 07-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> Revert "Update Trusted Credentials screen in settings"

This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.

Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
asspoint/WifiPasspointManager.java
0f5efe0b440832f6dea37b4381f9e4ebafd9bcad 07-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> Merge "Update Trusted Credentials screen in settings" into lmp-dev
1386627335a79dd02fb34db344e63ca3abfce013 15-Jul-2014 Zoltan Szatmary-Ban <szatmz@google.com> Update Trusted Credentials screen in settings

Trusted credentials for both the primary user and its managed profiles are shown
on the Trusted Credentials fragment. All functionalities (e.g. disabling/enabling
of certificates) remain available.

Bug: 16029580

Change-Id: Ia92ae02d8c572bf4a3be172f6c255726cefc0fa1
asspoint/WifiPasspointManager.java
ea676a0e51504aa53dff9cbe64085658987703b2 30-Jul-2014 Vinit Deshpande <vinitd@google.com> Rename HotspotListener to BssidListener

And other usage of term Hotspot. This is to be technically correct
with the name usage, should the API become public later.

This change also fixes few outstanding requests from GScan API.These
include

a. An event with scan results when REPORT_AFTER_EACH_SCAN is set.
b. ScanSettings now takes in number of APs as an argument.
c. Removed single shot scan API (since it is not implemented anyway)

Change-Id: Id160f9f14193a37cce5f3ab8d6ea528344b788a0
canResult.java
ifiScanner.java
f7d3700ea117320854670a301a3fa9c42cdaa96a 29-Jul-2014 vandwalle <vandwalle@google.com> record join attempts

Change-Id: I82ef09ec46d7ac7cc8bbe2939873a5f966ee0df7

On branch scorer-logs
Changes to be committed:
modified: java/android/net/wifi/WifiConnectionStatistics.java

On branch scorer-logs
Changes to be committed:
modified: java/android/net/wifi/WifiConnectionStatistics.java
ifiConnectionStatistics.java
0ae4e5da22e719cae5848338c16b66f6eaa10261 29-Jul-2014 vandwalle <vandwalle@google.com> Merge "fix typo in scanresult" into lmp-dev
ec5a901ea88109f2bd5ac0a635b48176135ed32f 29-Jul-2014 vandwalle <vandwalle@google.com> fix typo in scanresult

Change-Id: I4a7998097419bebeb94b23785567865b19205642
canResult.java
16a40cc7b597f0492f633cc0f742dc796955e7fd 29-Jul-2014 vandwalle <vandwalle@google.com> add debug info to wificonfiguration dump

Change-Id: I4887afa21d6e1d9463fa4a5cd0aa7ae22973239f
ifiConfiguration.java
57188b8908286118be96348c3bc72931d197b522 28-Jul-2014 vandwalle <vandwalle@google.com> Merge "introduce WifiConnectionstatistics" into lmp-dev
4eeecb25509f91ac7a6e2cde76dac782fbec5360 26-Jul-2014 vandwalle <vandwalle@google.com> introduce WifiConnectionstatistics

This CL is dependent on I10584a447fecd977df3eefd8e2cc028bd26ec0e3

Change-Id: I51fbbf062feb22c5f16b438675519064cc43e160
WifiManager.aidl
canResult.java
ifiConfiguration.java
ifiConnectionStatistics.aidl
ifiConnectionStatistics.java
ifiInfo.java
ifiManager.java
ifiNetworkConnectionStatistics.aidl
ifiNetworkConnectionStatistics.java
c4272f32aec68ae2377141a2d6d4e6059fb36714 26-Jul-2014 Vinit Deshpande <vinitd@google.com> Enable RTT End-to-end

This change includes various fixes to first RTT implementation and
enables RTT APIs end-to-end. Fixes include proper marshalling of
objects across API and service and JNI fixes.

Change-Id: Ie4ba1ffc6c5b42593e931438b3f03e201ff6be71
ttManager.java
eb8f329a5e8d4df80447ab9676761f9743d20cd4 24-Jul-2014 Chelsea Derrick <chelsead@google.com> Also unhide WifiConfiguration.lastUpdatedUid.

Bug: 16153258
Change-Id: I69c2666a63c3e56787c4aa2699c2cfd22c053353
ifiConfiguration.java
154b2cf6bbb99ee258b289846183172139a87dba 24-Jul-2014 vandwalle <vandwalle@google.com> autojoin fixes:

- make use of network scorer for autojoin
- Bug:16484607

Change-Id: Ib26cfe31aa5646facf781a2345981e06a6fc36e3
canResult.java
ifiConfiguration.java
adae06be9bfd8cb756e1793b52e682eb87258968 16-Jul-2014 Chelsea Derrick <chelsead@google.com> Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]

Bug: 16153258
Change-Id: Ic4fcf1d5454b9bf5ae31cefb48322dae187338bc
(cherry picked from commit 761f6cb69d3ac20dfc274eed2246f50da942b0c0)
ifiConfiguration.java
7effa118e08b296feaea36a7865fb52518cbdabc 17-Jul-2014 Vinit Deshpande <vinitd@google.com> Merge "Introduce RTT Manager" into lmp-dev
7686c061b7c5c981c79e566e3b31f68b9e21c730 01-Jul-2014 Vinit Deshpande <vinitd@google.com> Introduce RTT Manager

Change-Id: Ic9a16d587897b272f85cdb2b8c52b51bca060d18
RttManager.aidl
ttManager.java
ifiScanner.java
758bdf4a915c313f1c3bef0b95b494c91f363f03 17-Jun-2014 Wenchao Tong <tongwenchao@google.com> Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]

This is very similar to the existing
WifiManger.getConfiguredNetworks(), but it returns real preSharedKey.
This API is only used by system application.

Bug: 15703353
Change-Id: If3eaca3286e77b780272f42a28772d1d8d39db65
(cherry picked from commit 775bf6ae5d052948bcb60eaf89defa9105d7077c)
WifiManager.aidl
ifiManager.java
cdd5858e481fb0087c40c5997a9fa1446b326165 18-Jun-2014 Wenchao Tong <tongwenchao@google.com> Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]

* Only allow system app to send/receive
WIFI_CREDENTIAL_CHANGE.
* Define constants in WifiManager.

Bug: 15703353
Change-Id: I4bcc6bc82ec01952500eef3965cf81116bba693d
(cherry picked from commit f4a43f196e1132968a8add60efa4ae4558f8b010)
ifiManager.java
81e32da98f5a8ab11bb557f4f12de022ab59b48b 11-Jul-2014 Vinit Deshpande <vinitd@google.com> Unhide WifiAdapter APIs

Change-Id: Ia19ab4cfddddd3285ae9e0c5804f2cceda4cf063
ifiAdapter.java
ifiManager.java
ebb530619569dae465e68a4e53e4cdc749ae3727 10-Jul-2014 Vinit Deshpande <vinitd@google.com> Fix name mismatch in WifiAdapter

Change-Id: I895a2b7a8aa07a14f54543d0f86ad4a8e7660051
ifiAdapter.java
c7cc37b3cd2a73882e75c74ff9ca2499011ce193 07-Jul-2014 Vinit Deshpande <vinitd@google.com> Introduce Wifi Adapters

This change extracts all the wifi interfaces on the device; and provides
its supported features.

Change-Id: I7fbdbec684d653a6e4bf851797e3065ce222e873
WifiManager.aidl
ifiAdapter.aidl
ifiAdapter.java
ifiManager.java
19024b6d82aa80327f0f90303ef681938012fbe7 27-Jun-2014 Vinit Deshpande <vinitd@google.com> Lower minimum scanning period in WifiScanner

Change-Id: I4af8200a23c2b61b2505424a3832ca47d390fd80
ifiScanner.java
35d552f7adf0ccffbd78c4220862188a198dda7d 09-Jul-2014 Wei Wang <weiwa@google.com> Make WifiScanner System API

Change-Id: I0e2ebae998165abbb48a8cee0a3723ace2ca99e5
ifiScanner.java
f5af4a972598611c46d4bf169919e23b7375a5a9 08-Jul-2014 vandwalle <vandwalle@google.com> add BSSID blacklist indicator

Change-Id: I6f5f437327de9516468386628095eb4cbee68472
canResult.java
ifiManager.java
ae81483a15bb3811cfc221970ea290599b43d4de 07-Jul-2014 Sky Faber <skyf@google.com> Enable ability for secondary users to scan for networks, but not forget.

Bug: 15437477
Bug: 14676589
Change-Id: I3f1956265f4877b8c3cba138628b7393c393d175
ifiManager.java
833a6f3d1bf0ade93fc0d35dcb12fc1902a7761d 03-Jul-2014 roger.chang <roger.chang@mediatek.com> Hotspot 2.0 - connect R1 used API to stateMachine(2/2)

Change-Id: I5a0b0873be51c06a015d508af2670d36008ca7f7
asspoint/IWifiPasspointManager.aidl
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointManager.java
5f9385f7eaaacf854bfbe3268eefd3dd39dab05a 01-Jul-2014 Yuhao Zheng <yuhaozheng@google.com> Add two Passpoint fields to WifiConfiguration

We need two new fields in WifiConfiguration for Hotspot 2.0:
requirePMF & updateIdentifier

Change-Id: I288fee7a413286c48eedd034a5aca60a40b831a8
ifiConfiguration.java
1be1a134c8ea4553662cf4e5cbb7ddce43c6b73e 20-Jun-2014 Yuhao Zheng <yuhaozheng@google.com> Hotspot 2.0 fix launch browser method

Change-Id: I484b526fa92c4e3651e8fe6ae5614f22ba8134d4
asspoint/WifiPasspointManager.java
d96e4948daf687f3f631ba8d93c89026fd3ce272 26-Jun-2014 Andres Morales <anmorales@google.com> Merge "interface for nfc handover supplicant commands"
78c8e7c8bfd816a2466f858ff26ab12ea7a2e510 07-Feb-2014 Jianzheng Zhou <jianzheng.zhou@freescale.com> DO NOT MERGE refactor wifi p2p's startDhcpServer function

Add getTetheredDhcpRanges() interface and call it before calling
mNwService.startTethering() to update dhcp ranges. This will allow p2p app
to run well concurrently with other tethering app(e.g. usb tethering).

Change-Id: I5e8ffeb5d2d396f48b897cd9396f133e25ecca57
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2p/WifiP2pService.java
7610fa66cd0980703986cf5be95a307397040bf1 20-Jun-2014 vandwalle <vandwalle@google.com> add home network boost

Change-Id: I4b508b3f54304c0b3fea126c3905ed3322c2feee
ifiConfiguration.java
d524c78d9358e2fa1e67124468cffa5284870c62 18-Jun-2014 vandwalle <vandwalle@google.com> initial tuning

Change-Id: Iffe899225899e7805478a507ce270d537dc84abd
WifiManager.aidl
ifiConfiguration.java
ifiInfo.java
ifiManager.java
3bcbf38e7d33ebd331ce5722b0314c47aae4f454 16-Jun-2014 Yuhao Zheng <yuhaozheng@google.com> Passpoint OSU bug fix + API rename

- OSU bug fix
- API rename

Change-Id: Ic4a09d53177e5c6a81269da7208841d4c6f02716
asspoint/WifiPasspointInfo.java
asspoint/WifiPasspointManager.java
9740e468bc895cbc08c71aecc35fc56c3faafa06 08-Feb-2014 Andres Morales <anmorales@google.com> interface for nfc handover supplicant commands

expose:
NFC_GET_HANDOVER_SEL
NFC_GET_HANDOVER_REQ
NFC_REPORT_HANDOVER

These are used in for setting up WFD with NFC and
are only accessible given the CONNECTIVITY_INTERNAL
permission.

Change-Id: Ia43afc137d474822cad896d335530654081a808c
2p/IWifiP2pManager.aidl
2p/WifiP2pManager.java
535e0fb8060458c827a29b99af579dd656ef8c49 11-Jun-2014 roger.chang <roger.chang@mediatek.com> Wifi Passpoint - add new API and change equals element

- add createWifiConfiguration()
- correct getHomeSp to isHomeSp
- add clientCert for equals function in TLS case

Change-Id: Ib8d563ec8937da5ef3673a31b2afd9a8856ec9bb
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointPolicy.java
72d87d99b02c6523a4a3cb83e0d5cf6c8e01075f 13-Jun-2014 vandwalle <vandwalle@google.com> auto-roam fixes, disable scanning based on traffic at interface

Bug: 15575229
Bug: 15577651

Change-Id: Ia8914a90d803fd9e6ba9fa51efce50c7b7f1c692
ifiConfiguration.java
ifiInfo.java
0811cbee480524521750f43ac2a608cf84dba8aa 12-Jun-2014 Yuhao Zheng <yuhaozheng@google.com> Merge "Wifi passpoint - linking APIs"
ef9ef71a77f9d9c9822205362e23c6171538e68d 29-May-2014 Yuhao Zheng <yuhaozheng@google.com> Wifi passpoint - linking APIs

cherry-pick from kwd:

99d4cc Wifi Passpoint - linking credential match API
https://partner-android-review.googlesource.com/#/c/59247/

b5f5ef Wifi Passpoint - linking OSU API
https://partner-android-review.googlesource.com/#/c/59282/
asspoint/IWifiPasspointManager.aidl
asspoint/WifiPasspointInfo.java
asspoint/WifiPasspointManager.java
asspoint/WifiPasspointOsuProvider.java
daf215cf95fe5464d67465d9a6540c6296ca90bd 10-Jun-2014 Vinit Deshpande <vinitd@google.com> Support scanning using band specification instead of channels

This change enables scanning with band specification instead of channels,
this should ease app development.

Also includes a bug fix for parcel serialization/deserialization.

Change-Id: Idbffce4805b403bf8fe1efae999cb828e09c2420
ifiScanner.java
e344cb226885b071c0aad5dd034518fca5002841 04-Jun-2014 Vinit Deshpande <vinitd@google.com> Fix an NPE in WifiScanner while reporting description

Change-Id: Ie9d12e19e0b8ca98c6ec4c6fa5222a2f28983e64
ifiScanner.java
f980c53f86affedc51d31c939a1435d26bc0e050 12-Jun-2014 vandwalle <vandwalle@google.com> reset counters when disconnecting

Change-Id: If19d97d481a93343cf9792ff77bf9926ae5c26a7
ifiInfo.java
111fa0274d1d6620f9634783585387f3b773949e 11-Jun-2014 vandwalle <vandwalle@google.com> auto-roam initial implementation

Change-Id: Iad207974b2fea97420cc6131c5fa0a1f17bf2aac
canResult.java
ifiConfiguration.java
ifiInfo.java
2ab9089dfa0c0526e8bf0aaade8a09dec021dc90 03-Jun-2014 vandwalle <vandwalle@google.com> remember and report network score

Change-Id: Iccb2ec603bc9c0d3cf1976d0cc3f343cb1096494
ssiPacketCountInfo.java
ifiConfiguration.java
ifiInfo.java
ifiLinkLayerStats.java
e40348cf47093ab682abc98bd668b61841626a6e 31-May-2014 puff wen <puff.wen@mediatek.com> Add class CellularNetwork for plmn parsing and retrieve mcc and mnc.

Change-Id: Ic5d9c35ea8adcb432c7e601321050fbdfecc5fa7
asspoint/WifiPasspointInfo.java
0dcecc1cab9e0586ccc4725a2dab068e78207387 02-Jun-2014 vandwalle <vandwalle@google.com> Merge "handle removal of self added configurations"
2d0f71eea20470985abde98d759910a1ac40b257 01-Jun-2014 vandwalle <vandwalle@google.com> handle removal of self added configurations

Change-Id: Ib2891ac38a4a876b0cd4f198cf26198b9fc12909
ifiConfiguration.java
7f28e844c12403e77dc62b2d0ccf34a9639745e0 28-May-2014 Yuhao Zheng <yuhaozheng@google.com> More ANQP parsing

Change-Id: Ie24eeffa145f2a1bda0cd8e74a52103fdf4b7674
canResult.java
asspoint/WifiPasspointInfo.java
asspoint/WifiPasspointOsuProvider.java
85382f145901070afbe6b991861aa48c4bc1aba3 31-May-2014 vandwalle <vandwalle@google.com> Merge "add uid and debug fields to wifiConfiguration"
8f13548615f647a1208ace5369b504cb41149965 30-May-2014 vandwalle <vandwalle@google.com> add uid and debug fields to wifiConfiguration

Bug:15111865

Change-Id: I154214c08efe769495cc214cbf65f15d55d83a32
ifiConfiguration.java
901b87d2c7a1a24d78999caf9dc33b8d438f5760 31-May-2014 Yuhao Zheng <yuhaozheng@google.com> Merge "Hotspot 2.0 framework - Update implementation"
8dd64036cdaec757d3b19654a2c3c336ce902433 28-May-2014 roger.chang <roger.chang@mediatek.com> Hotspot 2.0 framework - Update implementation

1. Change API naming
2. Combine 2 constructors
3. Add comments for usage

Change-Id: I13d98ed82879b46252bb86a7be7b0a5382024c72
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointDmTree.java
asspoint/WifiPasspointPolicy.java
55027bb7b87ddcb05d65892677a2e0fe42f66ba2 30-May-2014 Vinit Deshpande <vinitd@google.com> Accomoditing API Review feedback for WifiScanner

cherry-picked from klp-wireless-dev
SHA1 8217e22356a8828a725ba7654cf25b05a49108fb

Main changes include

- hiding the API for LMP preview
- moved information elements to ScanResult object
- removed objects from events
- changed API names to be more consistent

Bug: 15191968
Change-Id: Ibe3907366aee85f7d56021a536ae0f9f9fb28b38
canResult.java
ifiScanner.java
8a9eb81df1218884bf0c4cdb214d2f1ec0a5679c 27-May-2014 Yuhao Zheng <yuhaozheng@google.com> Wifi Passpoint API change

- hide package android.net.wifi.passpoint
- extend android.net.wifi APIs for Passpoint credential management
> hide for preview

Bug: 15191967
Change-Id: Ic90818cf5c91e93dd7890774543e08b842edc594
ifiConfiguration.java
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointManager.java
bd9af355975e0feb54385c4615b9f9314b52dba7 23-May-2014 Yuhao Zheng <yuhaozheng@google.com> Update Hotspot 2.0 SDK APIs

Change-Id: I0528b378219e03f896497127b5c4b191bf014141
asspoint/WifiPasspointCredential.java
7c28c3663470ce5eb818cfa2ce4a993e4bae8f33 22-May-2014 Yuhao Zheng <yuhaozheng@google.com> Update Hotspot 2.0 SDK APIs

- Add / fix java docs
- Add some setters in WifiPasspointCredential for update use

Change-Id: Ifc287ab9d69ea9e02bf036f22171947fde9ee94a
ifiEnterpriseConfig.java
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointManager.java
559486f081f0e45247daeec50bc34e0e74e56c5a 22-May-2014 vandwalle <vandwalle@google.com> revert change preventing NULL SSID in a WifiConfiguration

bug: 15114340

Change-Id: Ic66363fc7781a1d65e5b8647843a752c048145a1
ifiConfiguration.java
3a74e2ef1681eaae973fc989b3533a7f9c82e7b1 22-May-2014 vandwalle <vandwalle@google.com> remember last supplicant failure

Change-Id: I644d32d08491ea0c32cb36820d2720da027a49d0
ifiConfiguration.java
5fb7bf5fdb93831684b00eb637ec15b5cf0d1e2d 22-May-2014 vandwalle <vandwalle@google.com> make verbose logging a wifimanager hidden API

Change-Id: I325f6ea9f1a6c16dbee9aca641cad7ed3bcd7d2c
WifiManager.aidl
canResult.java
ifiConfiguration.java
ifiManager.java
2a2dace66500d6057b9dc87bbe9597d7302ec914 21-May-2014 vandwalle <vandwalle@google.com> Merge "various autojoin fixes"
d3adb7e81658b9c3af8955360acd1b930be6cda8 21-May-2014 vandwalle <vandwalle@google.com> various autojoin fixes

Change-Id: I96acd02764a6fd7c8482ab82bd7e33280b90a577
ifiConfiguration.java
674ca8a1f47c07033645a1016e68a2e82597e2fa 21-May-2014 Vinit Deshpande <vinitd@google.com> Make Wifi WPS API available on application layer

Un-hide WPS methods (and required interface classes, etc.) of WifiManager to
enable Apps to start/stop the WPS procedure, add a patch for WPS method
KEYPAD to avoid early failure callbacks. (Methods PBC, DISPLAY, KEYPAD
tested on 4.4.2_r2.)

Change-Id: I25aafdc4b637c87d754d4fdb70e40a34a569b738
Signed-off-by: Olaf Stoyke <o.stoyke@avm.de>
ifiManager.java
psInfo.java
7fee7232ee2ae45fb3cd4fcce314e8f1101ae8db 15-May-2014 Roger Chang <roger.chang@mediatek.com> Hotspot 2.0 framework - add implementation

Bug: 5485670
Change-Id: I4d0f728f4c20676232f2d61bbf49691f6e21a100
canResult.java
ifiEnterpriseConfig.java
asspoint/IPasspointManager.aidl
asspoint/IWifiPasspointManager.aidl
asspoint/PasspointCredential.aidl
asspoint/PasspointCredential.java
asspoint/PasspointInfo.aidl
asspoint/PasspointInfo.java
asspoint/PasspointManager.java
asspoint/PasspointOsuProvider.aidl
asspoint/PasspointOsuProvider.java
asspoint/PasspointPolicy.aidl
asspoint/PasspointPolicy.java
asspoint/WifiPasspointCredential.aidl
asspoint/WifiPasspointCredential.java
asspoint/WifiPasspointDmTree.aidl
asspoint/WifiPasspointDmTree.java
asspoint/WifiPasspointInfo.aidl
asspoint/WifiPasspointInfo.java
asspoint/WifiPasspointManager.java
asspoint/WifiPasspointOsuProvider.aidl
asspoint/WifiPasspointOsuProvider.java
asspoint/WifiPasspointPolicy.aidl
asspoint/WifiPasspointPolicy.java
asspoint/WifiTree.aidl
asspoint/WifiTree.java
6346155c5a48495944041e65ec279c88b0fa1391 10-Mar-2014 Jaewan Kim <jaewan@google.com> Move IP config from WifiConfiguration to IpConfiguration.

This is so that Ethernet can use it in the future.

Bug: 7606609
Bug: 8687763

Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
ifiConfiguration.java
c101b1c90b5c2e649c7f4b14c9c40c570a3ece05 20-May-2014 Vinit Deshpande <vinitd@google.com> Implement onPeriodChanged and multiple scans of same channels

This change fixes multiple scans of same channels; and it generates
onPeriodChanged event.

cherry-picked from partner:klp-wireless-dev
SHA1 950564a305865cc0ae2bc528479ea6922efbb898

Bug: 15000051
Change-Id: I06a4ecc9d45eda4984de50b97b39f623dd0b26d1
ifiScanner.java
ff251510b4a13cd5798de7cc67b013d3d673b136 17-May-2014 Vinit Deshpande <vinitd@google.com> Fix docs build break in passpoint manager

Change-Id: I045a361d3a5c3f55c77dd33271892e50f275ab0d
asspoint/PasspointManager.java
b914c3343f94f54d84ce163a38c23212202d7d6d 10-May-2014 vandwalle <vandwalle@google.com> introducing link layer

Change-Id: Ie949d5edf07ef538fff815d9600a02565658ee7e
ifiLinkLayerStats.java
fdb2575a8029dfe90a55c4ecc594bb5628bdf361 16-May-2014 Vinit Deshapnde <vinitd@google.com> Fix doc build - ScanResult is exposing PassointInfo which is still hidden

Hiding the passpoint information for now.

Change-Id: Ic3cbb84d251478af687d9d46e2276115c8ebef18
canResult.java
8ca0339ddb698b2e85ba625ca73256233189ec3b 14-May-2014 Vinit Deshapnde <vinitd@google.com> Enable more features on WifiScanner

This change enables full scan results and allows overriding wifichange
configuration. There are also minor API changes take relavent parameters.

Change-Id: I6ebcb49f64bd8bc9e5e0c88c3b56eb634783524e
ifiScanner.java
0c78205e664e679c4bf9543e17372879d5010611 13-May-2014 Yuhao Zheng <yuhaozheng@google.com> Hotspot 2.0 framework API -- more functionalities

- Added resolution parameter for requestOsuIcons()
- Added ANQP parser (OSU provider list only)

Bug: 5485670
Change-Id: I69f6fd2ce6f80980ad786c2a3833cca8279771b3
canResult.java
asspoint/PasspointInfo.java
asspoint/PasspointManager.java
asspoint/PasspointOsuProvider.java
a4864472313208e4f1de02f45d3eadad237c54af 10-Apr-2014 Yuhao Zheng <yuhaozheng@google.com> Hotspot 2.0 framework APIs -- initial implementation

Cherry-picked from klp-wireless-dev-mirror
SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4

Bug: 5485670
Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5
canResult.java
otspot/IWifiHotspotManager.aidl
otspot/WifiHotspotManager.java
asspoint/IPasspointManager.aidl
asspoint/PasspointCredential.aidl
asspoint/PasspointCredential.java
asspoint/PasspointInfo.aidl
asspoint/PasspointInfo.java
asspoint/PasspointManager.java
asspoint/PasspointOsuProvider.aidl
asspoint/PasspointOsuProvider.java
asspoint/PasspointPolicy.aidl
asspoint/PasspointPolicy.java
asspoint/WifiTree.aidl
asspoint/WifiTree.java
1ab9cc8029f723cc6198c013d9df1477fad2d3f9 10-May-2014 Vinit Deshapnde <vinitd@google.com> Unhide the WifiScanner API

This change also adds java docs where needed.

Change-Id: I1b7e56e31d460bc773dab9603fbebacf7c439e60
ifiScanner.java
94f77dbb025f0182f2fe816b2a00ffa1cd2becfc 10-Apr-2014 Navtej Singh Mann <navtejsingh@google.com> Fixed bypass of ConnectivityInternal permission

Removed public function 'getWifiStateMachineMessenger' of
WifiManager to fix bypass of ConnectivityInternal permission
by application, which is security concern

Bug: 13749822

Change-Id: I3ae73e33b77ee8ae0133ca9dc8cc03c504f09e40
WifiManager.aidl
ifiManager.java
13f48ffab8c24d18a0a83e488a9b358a730580d4 15-May-2014 vandwalle <vandwalle@google.com> autojoin fix for devices which are using the enableNEtwork API

Bug: 15000352

Change-Id: Ib8b5dfd517e48444913f0ad0e5d08749d6eaa757
ifiConfiguration.java
e50869df0d1a216a73c7bcbeeb9406d5ba475b20 13-May-2014 vandwalle <vandwalle@google.com> autojoin is to eager to black list networks due to connection failure

Bug: 14834820

Change-Id: If2862ce09faf583d25cac7713c619975713ccd95
ifiConfiguration.java
7b81602f3c18df8a4ca0342c514af8f7e394c0d7 19-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Enabling internal msg apis

NetworkFactory and NetworkAgent. First trying with wifi and
getting rid of WifiStateTracker.

Conflicts:
api/current.txt
services/core/java/com/android/server/ConnectivityService.java

Change-Id: I7f0ec13d7d8988b32f3c6dc71f72012f3349fe02
ifiStateTracker.java
f9cb86aebe9647e0fe0137fc198ba16c017445c6 09-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Replace LinkCapabilities with NetworkCapabilities

Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
ifiManager.java
ifiStateTracker.java
60a28c6c4b992d1d3959484442a205d6ae2bd977 09-May-2014 vandwalle <vandwalle@google.com> Don't crash when asked to enable an AP with a null SSID.

WifiConfiguration can have been build by an app with a NULL SSID, or
other null fields. We need to verify that at least that those fields
are not NULL before using them. More specifically, don't crash when
enabling an AP with a null SSID in setApConfiguration function.

Bug: 14568953
Change-Id: I6b33ddf97789c0ee4b850d3ec0bccb08100c21d5
ifiConfiguration.java
011e1b35a64180d6f0234af8a3c2b70777eb9f39 08-May-2014 Vinit Deshapnde <vinitd@google.com> Initial implementation of WifiScanner

This change implements basic functionality of WifiScanner. Following
functionality is enabled

1. Scanning - specify a list of channels to scan
2. Significant change detection
3. AP hotlist

Change-Id: Ieef75b96bdbbd3c7d9b9e698bd16e64d3b465254
WifiScanner.aidl
canResult.java
ifiScanner.java
7c3606c103e95d3991267cca2592402a68779caf 01-Apr-2014 vandwalle <vandwalle@google.com> initial Best Network Selection implementation

-add dhcpserver, defaultGwMAC address, linked configuration and user choices link lists to WiFiconfiguration
-add default gateway mac address to RouteInfo
-add a Date to the ScanResult
-add BSSID date to the WifiConfiguration
- make framework auto-join into a config option
- add Settings option for showing RSSI in Wifi picker view; add auto-join specific status to WifiConfiguration

Change-Id: I5cfc4f2a48c9f3bc9766e8e68e24eff7b57f2821

Changes to be committed:
modified: core/java/android/provider/Settings.java
modified: wifi/java/android/net/wifi/ScanResult.java
modified: wifi/java/android/net/wifi/WifiConfiguration.java
canResult.java
ifiConfiguration.java
baa00cc350572c34718d770a31ebe2f76ffc9607 07-Apr-2014 Jaewan Kim <jaewan@google.com> Merge "Revert "Refactor IpConfiguration from WifiConfiguration""
678979748585c5903125a404e448ad6c111dedad 07-Apr-2014 Jaewan Kim <jaewan@google.com> Revert "Refactor IpConfiguration from WifiConfiguration"

This reverts commit 1284767ceb1affa6d5af77fd26ccf7322df48a6d.

Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
ifiConfiguration.java
ce245e1c6546ef05a8645d2d54bfa3e2e4178046 07-Apr-2014 Jaewan Kim <jaewan@google.com> Merge "Refactor IpConfiguration from WifiConfiguration"
1284767ceb1affa6d5af77fd26ccf7322df48a6d 10-Mar-2014 Jaewan Kim <jaewan@google.com> Refactor IpConfiguration from WifiConfiguration

Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
ifiConfiguration.java
2517be5b72904ddaee27eb1243fdc5dc4782ebf5 04-Apr-2014 Andres Morales <anmorales@google.com> Merge "Add calls for NFC WSC token creation"
c90005d2924f305f19a37720932cb2fa34d26446 20-Mar-2014 Wei Wang <weiwa@google.com> Use correct wifi batching parameter ranges.

Note these are slightly adjusted capabilities of N5.

Cherry pick.

Change-Id: Ia6888f6a5a69d135ff7e3c87d9744e18265fb3bf
atchedScanSettings.java
137ff532ebb062ea513d6ea0dd894b91f373d1a3 01-Apr-2014 Brian Williammee <bwill@google.com> Clean up two wifi javadoc comments

Remove references to TI drivers, and unnecessary uncertainty.

Change-Id: I74a01357264338df7c513684c6c752d1edb4ea4d
canResult.java
ifiInfo.java
10bf6354a536152719bf4524429aa5739836c541 25-Mar-2014 Yuhao Zheng <yuhaozheng@google.com> Wifi hotspot stack initial hook up

Add a dummy wifi hotspot service for futher development use. This is to
resolve the different between master branch and kwd branch, such that future
development can go into kwd and being auto-merged to master.

bug: 5485670
Change-Id: Ica58de445dd050a9f0b817f8e4accaa2478299c5
otspot/IWifiHotspotManager.aidl
otspot/WifiHotspotManager.java
002516fb0b76bb6349cad97a8ab8153a7dd015e8 21-Mar-2014 Wei Wang <weiwa@google.com> am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev

* commit 'bf0568468da9e02c177abaf9116f9995d53b59aa':
Fix stopBatchedScan not working for wifi
058061da46db0fdac8ea53c463a6b615fde3e928 21-Mar-2014 Wei Wang <weiwa@google.com> Merge "Fix stopBatchedScan not working for wifi" into klp-dev
d181673e2872ef4f4c47c109880cc9c03d2fd1ec 21-Mar-2014 Wei Wang <weiwa@google.com> Fix stopBatchedScan not working for wifi

Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
ifiStateMachine.java
ec253bb3765bd13d945f223a0af15d208745b757 20-Mar-2014 Vinit Deshapnde <vinitd@google.com> am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev

* commit 'f92b00722d84fa0caea25a3363242b6dced0635c':
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
45b97c2c99f89095861c0521fd6be4ab472aeee1 19-Mar-2014 Vinit Deshapnde <vinitd@google.com> DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns

This helps in reducing overt scans when cell network is unavailable; and
in turn helps alleviate some regulatory concerns.

BUG: 11062898

Change-Id: I2d860f2d1acfdafba427504247a54b81482b0f5b
ifiStateMachine.java
534054bc1b00224c93d7828203cf49a5764a7d8b 10-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

* commit 'e8af5e10e04697acb26b47e5d60b99e5c61a020c':
DO NOT MERGE Debounce wifi country code Info
fcbced38a6a53c5fa31568417170afcf14d86ae6 08-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE Debounce wifi country code Info

We're getting signals from the radio and it sometimes drops out for
a while. This change will delay applying an empty country code
for 15sec but apply non-empty country codes immediately. It uses a
sequence number so we only apply the most recent change, even if
it's delayed.

Also secures the wifi call to set the country code as we can't
allow apps to set it willy-nilly.

bug:11062898
Change-Id: I610039a833e26d4c5c8b7b9ac1b7546f3c83446a
ifiStateMachine.java
72e1400e2f20572ec469eb7c1257546eac1cbcf1 27-Feb-2014 Yuhao Zheng <yuhaozheng@google.com> Merge "Add new API to scan a given channel set"
738803fee62a98f244250996380820c4923e7f7b 06-Feb-2014 Yuhao Zheng <yuhaozheng@google.com> Add new API to scan a given channel set

Create new (hidden) APIs to scan a specified channel set. This is mainly for
location service for now, as doing frequent full scans (including DFS channel)
kills battery.

This set of new APIs contains:
- API to query available channel list for scanning, and DFS channels are marked
- API to scan a specified channel set

Selective scan results are returned in the same way as normal full scan ones.
In order not to intrude full scan results, BSS_FLUSH is NOT performed before a
selective scan. Therefore, selective scan results may contain results that's not
in the given channel set, and post-filtering may be required for location
service use.

Bug: 12610436
Change-Id: Icced18dd9b54f6dd92c0c2874d31518d56af8163
WifiManager.aidl
canSettings.aidl
canSettings.java
ifiChannel.aidl
ifiChannel.java
ifiManager.java
70a415e7fe56ecf0b2591d540913f70ed211d66d 03-Feb-2014 Felipe Leme <felipeal@google.com> Added support for WiFi frequency on WifiInfo (getter, settter, and frequency constant).
Bug: 12767819

Change-Id: Ib4a03919d9100861e993c733b7e478dc93dffaae
ifiInfo.java
b2e6bfd0f0fc675b253ce081d97ca192422a7495 17-Jan-2014 Andres Morales <anmorales@google.com> Add calls for NFC WSC token creation

Expose interface for generating Wifi Simple
Configuration tokens from supplicant.

Change-Id: Ie310a32f529c0330340e045aee561dc434aeee3e
WifiManager.aidl
ifiManager.java
ffadfb9ffdced62db215319d3edc7717802088fb 07-Dec-2013 Vinit Deshapnde <vinitd@google.com> Move Wifi/P2p service components under services

Some methods need to be public, since frameworks/base complies before
frameworks/base/services; and services takes build dependency on base.

Similar issue exists with WifiEnterpriseConfig constants.

Bug: 9907308
Change-Id: Ied0e3dee0b25c939067dbc66867a9814b3b3b68e
etworkUpdateResult.java
tateChangeResult.java
upplicantState.java
upplicantStateTracker.java
ifiApConfigStore.java
ifiConfigStore.java
ifiConfiguration.java
ifiEnterpriseConfig.java
ifiInfo.java
ifiManager.java
ifiMonitor.java
ifiNative.java
ifiStateMachine.java
ifiWatchdogStateMachine.java
2p/WifiP2pConfig.java
2p/WifiP2pDevice.java
2p/WifiP2pDeviceList.java
2p/WifiP2pGroupList.java
2p/WifiP2pService.java
3af71e6dcf078ad50c9d074e08b5b04311971f35 11-Dec-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: P2P: Fix WFD subelement parsing

Change-Id: Ifd802b59266760fb570fee28a6c34339a7f9fa01
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2p/WifiP2pDevice.java
4598ea4e5e6b2accce5165a76f5e2d04ce46c74c 09-Dec-2013 Lorenzo Colitti <lorenzo@google.com> am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."

* commit '263c4788dcf45f104f8668fd6621d1a7c39689b9':
Add address flags and scope to LinkAddress.
2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2 07-Dec-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Add address flags and scope to LinkAddress."
64483947fdb03bf838e317ac0a4af5e0f53a5bbf 15-Nov-2013 Lorenzo Colitti <lorenzo@google.com> Add address flags and scope to LinkAddress.

This is necessary so that the framework can know whether an IPv6
address is likely to be usable (i.e., if it's global scope and
preferred). Also, it will simplify the address notification
methods in INetworkManagementEventObserver, which currently take
the address, the flags, and the scope as separate arguments.

1. Add flags and scope to the class and update the unit test.
Use the IFA_F_* and RT_SCOPE_* constants defined by libcore.
Since most callers don't know about flags and scope, provide
constructors that default the flags to zero and determine the
scope from the address. Addresses notified by the kernel will
have these properly set. Make multicast addresses invalid.
Update the class documentation.
2. Provide an isSameAddressAs() method that compares only the
address and prefix information between two LinkAddress
objects. This is necessary because an interface can't have
two addresses with the same address/prefix but different
flags.
3. Update LinkProperties's addLinkAddress and removeLinkAddress
to identify existing addresses to add/remove using
isSameAddressAs instead of implicit equals(). Specifically:
- If addLinkAddress is called with an address that is already
present, the existing address's flags and scope are updated.
This allows, for example, an address on an interface to go
from preferred to deprecated when it expires, without it
having to be removed and re-added.
- If removeLinkAddress is called with an address that is
present but with different flags, it deletes that address
instead of failing to find a match.
4. Update the INetworkManagementEventObserver address
notification methods to take just a LinkAddress instead of
LinkAddress, flags, and scope. While I'm at it, change the
order of the arguments for consistency with the other
functions in the interface.

Change-Id: Id8fe0f09a7e8f6bee1ea3b52102178b689a9336e
ifiStateMachine.java
ebcb32f58a6220802ca129ea33f47b4b69931a10 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD

Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
317d15c15531b353aa3e8cb1a3ba03d98b71efb6 02-Dec-2013 Lorenzo Colitti <lorenzo@google.com> am 4806fdfb: am f226bc60: Merge "Use LinkAddress in address notifications."

* commit '4806fdfbd0fecf91584396fc0f620c97a05ab837':
Use LinkAddress in address notifications.
4806fdfbd0fecf91584396fc0f620c97a05ab837 27-Nov-2013 Lorenzo Colitti <lorenzo@google.com> am f226bc60: Merge "Use LinkAddress in address notifications."

* commit 'f226bc606af9ce5aceff6b05fc4b0200c94cb248':
Use LinkAddress in address notifications.
5ad421a3d00c92c155d57af9d1a05d81cc2fa88f 17-Nov-2013 Lorenzo Colitti <lorenzo@google.com> Use LinkAddress in address notifications.

Currently address{Updated,Removed} pass in the address as a
string such as "fe80::1/64". Use LinkAddresses instead, since
that's what it is.

This makes the code more robust in the unlikely case that netd
passes in an invalid string. In the future we can move flags and
scope into the LinkAddress itself and simplify the code further.

Bug: 9180552
Change-Id: I66599f9529cf421caa7676fdd0141bb110b8589e
ifiStateMachine.java
6090995951c6e2e4dcf38102f01793f8a94166e1 19-Nov-2013 John Spurlock <jspurlock@google.com> Remove unused imports from frameworks/base.

Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
atchedScanResult.java
ifiApConfigStore.java
ifiConfigStore.java
ifiManager.java
ifiStateMachine.java
ifiWatchdogStateMachine.java
psInfo.java
2p/WifiP2pDeviceList.java
2p/WifiP2pManager.java
2p/WifiP2pProvDiscEvent.java
2p/WifiP2pService.java
86513aafee5f44c680fbd5d6dbed9ce6ae28025f 19-Nov-2013 Vinit Deshapnde <vinitd@google.com> Merge "Refactor WifiEnterpriseConfig and move service part in WifiConfigStore"
5d5f5a3791ad8dd17125b65f0dd58a0363e183e6 14-Nov-2013 Vinit Deshapnde <vinitd@google.com> am 9dbaaab8: am daf21d76: am 75c12de0: Merge "Increase Reject threshold for disabling networks" into klp-dev

* commit '9dbaaab85eb4557b40086e6b37882af7b03725ba':
Increase Reject threshold for disabling networks
8fa06ee413fa15318190dffbbe6b4de6b4d73f30 14-Nov-2013 Vinit Deshapnde <vinitd@google.com> Increase Reject threshold for disabling networks

This change modifies a framework optimization. The framework optimization
disables a network when an access point repeatedly rejects requests
to associate with it. This change has some problems; one being that
it counts the rejects for all networks, and not for a specific network.
This incorrectly penalizes last networks at times; and since the current
threshold is 4 rejects, the probability of penalizing wrong networks
is high. This change ups that number to 16 to reduce that probability.

Bug: 11654725

Change-Id: I7150a9ccbb54bac44f2c2ba100fb6617ded33616
upplicantStateTracker.java
d528d48e5d8444de0730d62b9f621b9cc2df5fbd 08-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of c3eef190 to master

Change-Id: I36fd3c7fcbb13e47e27ffc340484c03b5a553bb1
ade8de3c4a021d6b0e753d77be148236af5f39ef 07-Nov-2013 Vinit Deshapnde <vinitd@google.com> Refactor WifiEnterpriseConfig and move service part in WifiConfigStore

This change moves the code related to 'importing' the configuration
in supplicant and keystore from WifiEnterpriseConfig class to
WifiConfigStore class. This would allow moving system classes
to server package.


Bug: 9989922
Change-Id: Id96f34bb5d16ef192e9174d9caa867bdfdacf803
ifiConfigStore.java
ifiEnterpriseConfig.java
a029ea131836725b050e1a7550aa171b68171522 26-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Add BatteryStats for Wifi Batched Scanning.

bug:10690989
Change-Id: Ia39b715ee6d5733970095bc76de0ed40ff8208c0
WifiManager.aidl
ifiManager.java
ifiNative.java
ifiStateMachine.java
405f731a4dccf867166df5a1064b44a791a1696b 22-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> am 63dd9d2f: am 4802c6da: am 4d8a8392: Merge "Don\'t set same country code on supplicant again and again" into klp-dev

* commit '63dd9d2f550983d890ea21eee9b8f8619608bb79':
Don't set same country code on supplicant again and again
da40d927667083a5f6bf752ef5fc86d8431dbff7 21-Oct-2013 Vinit Deshapnde <vinitd@google.com> Don't set same country code on supplicant again and again

Setting the same code is redundant, and may cause supplicant to drop
currently connected connection.

Bug: 11303252
Change-Id: I1af57b3af2d0b8cc51939a8b9872fb3fe0105a91
ifiStateMachine.java
2p/WifiP2pService.java
98e1797367ca8cd8b8476f6befdb55f81cd13e19 29-Aug-2013 Narayan Kamath <narayan@google.com> Remove captive portal code that has no effect.

Note that this CL does not change any behaviour.

At the center of this change is
CaptivePortalTracker#detectCaptivePortal(), which does nothing
except call back into ConnectivityService. Removing it allows us to
simplify code in ConnectivityService. It also allows us to remove
ConnectivityService#captivePortalCheckComplete which was only ever
called in response to this method.

While this does not change any behaviour, it preserves existing
bad behaviour, i.e, that the CAPTIVE_PORTAL_CHECK NetworkInfo
state does not correspond to actual captive portal detection.
We transition into that state and immediately (and unconditionally)
out of it and into CONNECTED.

Change-Id: Ib3797f956d2db5e3cacaaa53e899d81aa8e958af
WifiManager.aidl
ifiManager.java
ifiStateMachine.java
ifiStateTracker.java
ed22e9ce2f0672bed561fcb6d8e188cacda06b8c 14-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> am dcc31551: am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev

* commit 'dcc31551f80500a096b8eb95f7f0670b4c19fd95':
Make Wifi Scans more heap-efficient
c95d9381680c579a9f46aa7c7d7353d168eb8082 11-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Make Wifi Scans more heap-efficient

We were ending up with 1 reference to every char array
in which a new AP was discovered. In a busy env this could
cost several hundred K from the dalvik heap.

bug:11087956
Change-Id: I3b14c39fd0c98e4aea08a406e80bcf6af40d0664
ifiStateMachine.java
6e86fa8a6b69dfb8c8117791dc0f100b80fb616f 10-Oct-2013 Narayan Kamath <narayan@google.com> Fix WifiInfo#getHiddenSSID

The method would previously always return false.

Note that this is the simplest fix, and not the most
optimal fix. That said, in this change, a call to
WifiInfo#getHiddenSSID costs the same as a call to
WifiInfo#getSSID, so it isn't that bad.

bug: 10705138
Change-Id: I980563fd8a5bafe8c58c586449e778a0aa8b58a4
ifiInfo.java
ifiSsid.java
9787b10342c33a9d6e4dccc885b904c9c5ea6704 10-Oct-2013 Yuhao Zheng <yuhaozheng@google.com> am 86f48113: am 623dddc9: am 3309bc5f: Merge "WifiStateMachine: fix for exiting L2ConnectedState" into klp-dev

* commit '86f48113a5ee0f2d15ba9650b4335ba063ef48ad':
WifiStateMachine: fix for exiting L2ConnectedState
3309bc5f249d971a19c3db376dd94e28819fded3 10-Oct-2013 Yuhao Zheng <yuhaozheng@google.com> Merge "WifiStateMachine: fix for exiting L2ConnectedState" into klp-dev
6717e1d86fc008adc95eb80bc3fe2a4cc0b29fe9 10-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> am 7ecedb75: am f008ca33: am f681058f: Merge "Narrow previous fix for this issue." into klp-dev

* commit '7ecedb75c833a746c561dd0029b0accf175033be':
Narrow previous fix for this issue.
f3346191f8b84db90572abef94212c272347e99d 10-Oct-2013 Yuhao Zheng <yuhaozheng@google.com> am d37638e5: am 11a3bc70: am 709a4278: Merge "Don\'t mark wifi disabled unless it\'s off." into klp-dev

* commit 'd37638e5262fea65bf428cb78e73a9b4e02a93fe':
Don't mark wifi disabled unless it's off.
8d9167ded3a27607b3f231363a7b224e37d570ad 10-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Narrow previous fix for this issue.

Networks should be unconditionally disabled when going to
scan only state or we risk connecting when we don't want to.

bug:11062188
Change-Id: If89621ca07d86673a661d2e5fe4ce89286f8835e
ifiStateMachine.java
15af21252db3e45fd18c0db3b535bb8a632267ff 09-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Don't mark wifi disabled unless it's off.

The transition from driver-started to scan-only state was incorrectly
always marking wifi disabled, but transitioning back only marked it
enabled if we were exiting due to leaving the scan-only-with-wifi-off
mode.

bug:11062188
Change-Id: I44fe64fd8dac8f36f4e22cb1c16b9d7a06bdbac0
ifiStateMachine.java
8b033d37cac86ad4961891d760ca883e8bd0ef97 09-Oct-2013 Yuhao Zheng <yuhaozheng@google.com> Add a missing wifi p2p discovery changed broadcast

When we disable wifi while wifi p2p peer searching is in progress, we don't get
a WIFI_P2P_DISCOVERY_CHANGED_ACTION broadcast saying that discovery is stopped.
Since this broadcast is sticky, applications will still get the previous one
saying discovery is started even if wifi p2p has been disabled. Adding a
sendP2pDiscoveryChangedBroadcast when exiting P2pEnabledState fixes this problem,
and it won't be a duplicate as sendP2pDiscoveryChangedBroadcast checks for that.

Bug: 11151666
Change-Id: I62de8f3d17d80f151403b91cf5c62866d931c01b
2p/WifiP2pService.java
a9e6be83aeafd6e97e5eb52e12766b476ab94da0 09-Oct-2013 Yuhao Zheng <yuhaozheng@google.com> WifiStateMachine: fix for exiting L2ConnectedState

After a L2ConnectedState to WpsRunningState transition, network is disconnected.
However, the disconnected message is ignored by WpsRunningState, leaving DHCP
still running. When entering L2ConnectedState again, WifiStateMachine gets stuck
on waiting for DhcpStateMachine, because DHCP is already running and the command
CMD_START_DHCP is ignored. Calling handleNetworkDisconnect() when exiting
L2ConnectedState fixes this problem, plus it handles disconnection correctly.

Bug: 10900241
Change-Id: Id29e4989b29db7e64719940cf93eba1f1a90912a
ifiStateMachine.java
3378384123154ae29b3fb8cc87244ae742fae6bf 04-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> am 72566b98: am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev

* commit '72566b98dba80f21923cb6b299754d510951d611':
Revert "Use a build-specific wifi country code"
16f3c140cbe3a80fff04be7c281e435ae2daa007 04-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> am 1db7024c: am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev

* commit '1db7024c50abe49d8881d458b3317ccff3de1832':
Un-deprecate getDhcpInfo
cac2fd302e844a4a46bb1749a2d2ed4739b4dc53 04-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Revert "Use a build-specific wifi country code"" into klp-dev
1e9863f06ad4d006abb0a76677c246d1420d5352 04-Oct-2013 Vinit Deshapnde <vinitd@google.com> am 90a5192c: am e72aa641: am 3eb6e4b4: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev

* commit '90a5192cd4af89a1b363ca25be2a63d0e57010d4':
Fix EAP-TLS reconnect after reboot issue
cb2fe96f2c2b754bb2377acd3be46d62216251fa 04-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Un-deprecate getDhcpInfo

Replacement api isn't available.

bug:10003785
Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a
ifiManager.java
3eb6e4b4e46d64f96cba2d92265f7d3da0b8106a 03-Oct-2013 Vinit Deshapnde <vinitd@google.com> Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
3ea0c99b67407bb1612875762b037e50f013fd6d 03-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Revert "Use a build-specific wifi country code"

This reverts commit c33cd23c17c24df33550a6662cedfe60b323604a.

bug:11064682
Change-Id: I35825a7005e75f3abf02f23f31dee1cb7b101c31
ifiStateMachine.java
2p/WifiP2pService.java
a3038b2b311cd07d851c404ccc5df2f4e07bcfd8 03-Oct-2013 Vinit Deshapnde <vinitd@google.com> Fix EAP-TLS reconnect after reboot issue

After a reboot, KeyStore is locked, and certificates encrypted with user
PIN are not accessible. So statemachines are not able to connect to
EAP-TLS networks. This change makes the problem less severe by

1. Not signing certificates with user PIN on devices with hardware backed
KeyStore.
2. Issuing a reconnect upon first USER_PRESENT event.

This means HH (which has a hardware backed keystore) can connect to
EAP-TLS networks without requiring user intervention and other devices
will automatically connect to those networks after user punches PIN.

Bug: 10325089

Change-Id: I023d60e58d8214152f051bd9ec84b85b702d829a
ifiConfigStore.java
ifiEnterpriseConfig.java
ifiStateMachine.java
d29724c640433b82addbdad3a790b75aed2d9dc4 02-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> am 2b6b3d9c: am bad5d694: Merge "Use a build-specific wifi country code" into klp-dev

* commit '2b6b3d9c495d3c8332aad6515a1db06e8fde3848':
Use a build-specific wifi country code
c33cd23c17c24df33550a6662cedfe60b323604a 27-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Use a build-specific wifi country code

This ignores any previous setting and instead uses
a value set at build time. This does not preclude
us from using some other signal to determine country
for wifi channel limits.

bug:10513734
Change-Id: Ib82c07285af70fbd82eb0466b7391979ebc8be10
ifiStateMachine.java
2p/WifiP2pService.java
6add2a8337f280627fa331f9b7e61e4c5b9a3e89 25-Sep-2013 Vinit Deshapnde <vinitd@google.com> am 3d837d23: am e7d6bbd6: Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev

* commit '3d837d23c5910123330fbe6d18256ecc56ac7fcb':
Fix an incorrectly created race accessing Wifi Supplicant
6029611e3ab3e1adf3f463ed90abbdcc8b0bd7f1 25-Sep-2013 Vinit Deshapnde <vinitd@google.com> Fix an incorrectly created race accessing Wifi Supplicant

ScanModeState is trying to undo whatever it did in its enter(), in its
exit() function. But doing that is incorrect because it is possible to
transition to multiple states that require different conditions.

In this bug, the state machine transitioned from ScanModeState to
WaitForP2pDisabled state; in response to Stop Supplicant command. Well,
when we are trying to stop supplicant, there is clearly no need to
enable P2P or load all networks. But since this code exists in exit(),
it is executed nonetheless, causing race conditions accessing the
wpa_supplicant (WifiStateMachine is trying to shut it down, but
P2pStateMachine is trying to bring up the p2p interfaces).

We solve that problem by moving this code to the place where we transition
to DisconnectedState - since that's the state that needs this as a
precondition.

Bug: 10761752
Change-Id: Iaf0ffd8056de8533b5d2bfdf8c440fbb7e406dac
ifiStateMachine.java
ad93dc7f5cfda67c1b4043a102f0f3246ee1fef1 24-Sep-2013 Vinit Deshapnde <vinitd@google.com> am 10914a23: am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev

* commit '10914a23f71b42a2b9d08a0199689d84117d5e0c':
Allow yet another combination of key management options
662c326e5fc02fa11226de1267b7f60485f5638a 23-Sep-2013 Vinit Deshapnde <vinitd@google.com> Merge "Allow yet another combination of key management options" into klp-dev
7dadd1ed2f8e1820704d347044a2e36dd2ff2eac 22-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> am 1e690b69: am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev

* commit '1e690b693c2d4ee7ba04d5882f6b5889ada07e0a':
Fix BatchScan request coalesing
0983eadff23bfc3ab7812be455d4a66edc3dcc7b 22-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix BatchScan request coalesing" into klp-dev
13820af302ead6b6a17b5f1b3991fcf8af252f93 21-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Fix BatchScan request coalesing

bug:10407896
Change-Id: Ic22c7d8b2a80d490d208570782a12e42d4690f5c
atchedScanSettings.java
2871588101c9bf1e6c9573599dee9be106466175 21-Sep-2013 Vinit Deshapnde <vinitd@google.com> Allow yet another combination of key management options

Framework sets allowedKeyManagement to WPA_EAP + WPA_PSK, if
WifiConfiguration didn't supply any value for it. It should probably
change to NONE; but that is post K thing. I am allowing that
combination for now.

Bug: 10843500
Change-Id: Id0c28f4aaf32c6a7e7dca07114a2452ce194a798
ifiConfiguration.java
2875fb8586a9ffa42d63fd078fc5115791564680 20-Sep-2013 David Christie <dnchrist@google.com> am 0e500803: am f31a7897: Merge "Clear names from externally supplied WorkSources to WifiManager (b/10733757)" into klp-dev

* commit '0e50080395d2ed9e3c703f769ea3fb84706f989a':
Clear names from externally supplied WorkSources to WifiManager (b/10733757)
f31a78977401b155c0781dfe7d7cb6b7b38543c0 20-Sep-2013 David Christie <dnchrist@google.com> Merge "Clear names from externally supplied WorkSources to WifiManager (b/10733757)" into klp-dev
ce34f22b6985e282625293a3dcdb6ea702ab6a98 20-Sep-2013 Vinit Deshapnde <vinitd@google.com> am 27271f67: am a5fb1204: Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev

* commit '27271f673546faa973d7a24c594da626ebdbd337':
Fix incorrect exception being thrown from WifiConfiguration
a5fb1204385be2ab58bb4b653fbffae4f365b98c 20-Sep-2013 Vinit Deshapnde <vinitd@google.com> Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev
a31510e47a0f0c2525702c2f10a85064322a28f2 20-Sep-2013 David Christie <dnchrist@google.com> Clear names from externally supplied WorkSources to WifiManager (b/10733757)

Change-Id: I36102f13962df2093c1e35fb40081ead647eff32
ifiManager.java
12f6510170864ed199cca6b0ab27a234b6da4395 20-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> am 032de6c6: am c237c204: Merge "Supsend/resume batched scans around dhcp." into klp-dev

* commit '032de6c6294893045c0c17946b45800b5af47d60':
Supsend/resume batched scans around dhcp.
692af53a20772150a1715a4f48c660d9de0ef851 20-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> am eccc0905: am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev

* commit 'eccc0905bd150a334a98efedfb08570bcdd1c31a':
Cleanup the shutdown of BatchedScans.
c237c20441df671a4c596138976f15e40aa95cf3 20-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Supsend/resume batched scans around dhcp." into klp-dev
540784f903c8a9e808ef88d14fe5e1227bda4561 20-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Cleanup the shutdown of BatchedScans." into klp-dev
81fec6be04b302588a44e9730dbdf1d7d07a8abc 20-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Supsend/resume batched scans around dhcp.

Scanning while dhcp is running breaks dhcp, so stop the batched scans
when we need dhcp and start it up again after.

bug:10691401
Change-Id: Ifdeb6f35cfe4509b90fed1e1e694d0c107f24a7e
ifiStateMachine.java
0fd3b1be14ec6b6ba33140efa321b27dc3bf2862 20-Sep-2013 Vinit Deshapnde <vinitd@google.com> Fix incorrect exception being thrown from WifiConfiguration

Bug: 10817189

Change-Id: Ib2985f50080cb9d983a6de6ce668223e8782c3b6
ifiConfiguration.java
5380b780bb4f0839cd42ffe64cfb3b73857b6152 20-Sep-2013 Yuhao Zheng <yuhaozheng@google.com> am 2e9a4265: am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev

* commit '2e9a426529c54774b23609bee8d50118118ab895':
Remove STOPSHIP in WifiWatchdogStateMachine
82f4218c0d5dbc10404db8cf31f0284140d80175 20-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Cleanup the shutdown of BatchedScans.

Fixes binder-death as well as disambiguation when an app has multiple requests in.

bug:10641931
Change-Id: Ib701d531fa51e7e2a027848cfdfcad3b47056923
WifiManager.aidl
ifiManager.java
fffc5a4ec9a4688d6d26260d5a21002d1d9a9956 19-Sep-2013 Yuhao Zheng <yuhaozheng@google.com> Remove STOPSHIP in WifiWatchdogStateMachine

There used to be some STOPSHIP code in WifiWatchdogStateMachine for debug
purposes. We don't need them for the release.

Bug: 10841961
Change-Id: I501d62e9891ace52317e6c1d399b877175099a3c
ifiWatchdogStateMachine.java
d1fa1bb6900d6250dfdec92a274892b03f8ae15f 17-Sep-2013 Vinit Deshapnde <vinitd@google.com> am 007c6c7d: am c06b1db2: Merge "Consider current EAP TLS configurations as \'valid\'" into klp-dev

* commit '007c6c7d358fc617252da40c9ff214f55312c6f8':
Consider current EAP TLS configurations as 'valid'
3b25f51609209ecd1374278b3dbec55a7bd15813 17-Sep-2013 Vinit Deshapnde <vinitd@google.com> Consider current EAP TLS configurations as 'valid'

Multiple authentication methods are currently considered invalid; but
WPA_EAP and IEEE8021X are set simultaneously. This means we need to
fix code to consider them a valid combination.

Bug: 10325089

Change-Id: I2b4f4d75f21df78bfca66a930e85214c0cd6922e
ifiConfiguration.java
cc7360c354d7710d3dc637e2ccb31e1df010dc83 13-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> am 3d52eb7f: am 14e55996: Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev

* commit '3d52eb7f1dde460d547fc20ec0b93465d69ec496':
Fix Batched Scan Results to give Timestamp in uS
93a74730928c6bc47727e311f1260df4c114bf0a 13-Sep-2013 Stephen Hines <srhines@google.com> am 7d400ead: am 9d5c33c5: Merge "Fix build break with missing VDBG." into klp-dev

* commit '7d400eadb7340c139f35263f43fe3418d402f409':
Fix build break with missing VDBG.
14e55996722db1e74996b837c136a6e188143718 13-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev
bd9daeaac7231c53e5aa53781bbd6fbbd9941a0c 13-Sep-2013 Vinit Deshapnde <vinitd@google.com> am 4d1cef6b: am 96ece970: Merge "Disable additional logging in WifiConfigStore/WifiNative" into klp-dev

* commit '4d1cef6b3fec5ad4da0c99d57b1c4e768a2f1efa':
Disable additional logging in WifiConfigStore/WifiNative
8f8c563e6fd9132c16885b89a81f07ed9770889a 13-Sep-2013 Vinit Deshapnde <vinitd@google.com> am b2c06ba5: am b481dae2: Merge "Fix invalid Wifi Network system crash" into klp-dev

* commit 'b2c06ba5711ffa3781b9bfe1c11051cc274be9e3':
Fix invalid Wifi Network system crash
cbaf1525886427544cabd353d4529851399144f4 13-Sep-2013 Stephen Hines <srhines@google.com> Fix build break with missing VDBG.

Change-Id: Iaf64cf49300a6a0a91374efa3030d6894367c9b8
ifiNative.java
3569fdd9afdec7d32b290b41b7a16ff8467592f0 12-Sep-2013 Vinit Deshapnde <vinitd@google.com> Disable additional logging in WifiConfigStore/WifiNative

It was introduced to debug the disappearing APs; now that we think that
we've got to the bottom of it, it is being disabled by default. Set VDBG
to true to get it back.

Bug: 10568538

Change-Id: I226cacf48cccba9671f09164bbb50380adc6b322
ifiConfigStore.java
ifiNative.java
dee971b98c3b084af54ae2f42b6fa3d4734d58d9 12-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Fix Batched Scan Results to give Timestamp in uS

ScanResult should have timestamp in uS but we are getting age in ms
from the wifi driver - multiply to have the same units though not
the implied precision.

bug: 10410465
Change-Id: Idf5c5996d69a4793dae3d74edb790d40b9bd3298
ifiStateMachine.java
b481dae2f5238252d81dafeecf13d5f387824689 12-Sep-2013 Vinit Deshapnde <vinitd@google.com> Merge "Fix invalid Wifi Network system crash" into klp-dev
82653435451523ebc9dfea197f2b002f0740ef84 12-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> am 16666176: am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-dev

* commit '16666176c0de5abc1f5390b9b2e07c32e51a97f9':
Fix Wifi Batch Scanning
126755cf41710d52554d747f3d3667eb0a3c2694 06-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Fix Wifi Batch Scanning

Some parsing bugs, more debug logs, etc.

bug:9301872
Change-Id: I245ab00955e245be81a019750be0f8491aa505fd
ifiManager.java
ifiNative.java
ifiStateMachine.java
8d717b917cfe0b7d47743e2c80fd22131048ef3a 12-Sep-2013 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 03422d26 to master

Change-Id: I5d012fb122224c949a0039450bf0a9a475dc8e82
95d785346b4dae808a2d8f77356175e55a572d96 11-Sep-2013 Dianne Hackborn <hackbod@google.com> Fix issue #10688644: Java crash in com.android.phone:

java.lang.SecurityException: Operation not allowed

There was a situation I wasn't taking into account -- components
declared by the system has a special ability to run in the processes
of other uids. This means that if that code loaded into another
process tries to do anything needing an app op verification, it will
fail, because it will say it is calling as the system package name but
it is not actually coming from the system uid.

To fix this, we add a new Context.getOpPackageName() to go along-side
getBasePackageName(). This is a special call for use by all app ops
verification, which will be initialized with either the base package
name, the actual package name, or now the default package name of the
process if we are creating a context for system code being loaded into
a non-system process.

I had to update all of the code doing app ops checks to switch to this
method to get the calling package name.

Also improve the security exception throw to have a more descriptive
error message.

Change-Id: Ic04f77b3938585b02fccabbc12d2f0dc62b9ef25
ifiManager.java
3f94640e2657a4afa10e05ecd32845bd688e5b92 06-Sep-2013 Narayan Kamath <narayan@google.com> Fix a few synchronization issues in WifiMonitor.

- Guard all field accesses in WifiMonitorSingleton with
a lock.
- WifiMonitorSingleton is now responsible for dispatching
events to a given monitor (or all monitors if it can't
find a matching monitor).
- Individual WifiMonitors are now responsible for dispatching
events sent to them. This makes WifiMonitorThread a dumb
object. All it does is wait for events and feed them back
into the WifiMonitorSingleton.
- Also fixes a bug where we weren't telling the WifiMonitor
that we're disconnected and another where we don't check whether
a monitor is connected or not before asking it to dispatch
an event.
- Also, replaces a few uses of entrySet() with a values() iterator
when the keys are never used. The performance of both methods
is identical for a HashMap, but the latter is a bit more concise
and easier to read.

Change-Id: I7ce00174a78c72836666d25ccc5e6e9e687c2570
ifiMonitor.java
de1ef640631e26e9da083a485baebd59ddaf5ee2 10-Sep-2013 Vinit Deshapnde <vinitd@google.com> am f7bea433: am ba85b970: Merge "Set country code on P2p interfaces as well" into klp-dev

* commit 'f7bea43325e0ffe04f3a7f729cb141f690c58d2a':
Set country code on P2p interfaces as well
ba85b970f3ae7fd58c9a631e64bff0d05b787b9b 10-Sep-2013 Vinit Deshapnde <vinitd@google.com> Merge "Set country code on P2p interfaces as well" into klp-dev
2c385ecb1c390f7b695842fedfdebf95fd5e842c 10-Sep-2013 Vinit Deshapnde <vinitd@google.com> Set country code on P2p interfaces as well

This change will set country code on P2p interfaces as well, so the
drivers are free to use channels that are permitted regionally. This
is required for FCC style compliance and Miracast certification.

Bug: 10513263

Change-Id: I88c645bd488066d5167e23e2772f2e0e1f40fa8a
ifiNative.java
ifiStateMachine.java
2p/WifiP2pService.java
10652a95b16909acf26f31cdafc0c6aa09212f26 10-Sep-2013 Vinit Deshapnde <vinitd@google.com> Fix invalid Wifi Network system crash

There is some validation code that is eventually detecting that we
have an invalid network; only the result is a crash. The right thing
to do is to do validation up front; and fail calls if the network
configuration looks invalid.

Bug: 10571289

Change-Id: I100506b777a34b26ac9a310ba508140560f87a90
ifiConfiguration.java
ifiManager.java
d7363f434fa3be2a357d4bc6248ed9cfaf028463 07-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> am 4f54abfc: am 00cd7132: Merge "wifi: Fix cleaning scan result cache" into klp-dev

* commit '4f54abfc73fdf71ca7f7866106a98d73822fc893':
wifi: Fix cleaning scan result cache
8e7c1b1222003fd7b8f8918eb60d3ccd463c05b3 06-Sep-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Fix cleaning scan result cache

Bug: 10198923

Change-Id: I18dfc10860b8fb623751c62a4bc54b628246cf0c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiNative.java
9c395c8e26989cdfeb7b067fa3aa01c1f36950f7 06-Sep-2013 Vinit Deshapnde <vinitd@google.com> am 6a3b7db2: am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev

* commit '6a3b7db257db3e8c6be834fe69859bf2465af380':
Fix duplicate SSID entries in the WifiSettings UI
771c11b73941994d24e5da5851451ee4088499a6 06-Sep-2013 Vinit Deshapnde <vinitd@google.com> Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev
551624c46c834e8327aebf690d59fca6462941dc 06-Sep-2013 Lorenzo Colitti <lorenzo@google.com> am 6bddc317: am eadf1959: Merge "Track IP addresses in WifiStateMachine." into klp-dev

* commit '6bddc317554b43818e625519e094e0381859db82':
Track IP addresses in WifiStateMachine.
a2bcee619d91c9ff4821a85c9ea72b6391219309 05-Sep-2013 Narayan Kamath <narayan@google.com> Remove synchronization in WifiMonitorSingleton.

This isn't really required because the static initializer
for WifiMonitorSingleton won't run until the first access
to the (non primitive) static field "sInstance". Further,
static initializers will be run precisely once (i.e
first accesses to sInstance from multiple threads are safe).

Change-Id: I78fae225e4c5cb917e7e7817522595ae026daf47
ifiMonitor.java
eadf1959fbe2602f2c2b64ab0c4cd71a57d4f98c 06-Sep-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Track IP addresses in WifiStateMachine." into klp-dev
34b2b9b6db7d57993bd71c2b62191c1fc533ebff 08-Aug-2013 Lorenzo Colitti <lorenzo@google.com> Track IP addresses in WifiStateMachine.

This makes WifiStateMachine listen for interface address
changes. When an address changes, WifiStateMachine will update
its LinkProperties to match reality and notify the system that
the link configuration has changed. This allows wifi to keep
track of IPv6 addresses as well (previously it only knew about
the IPv4 address passed in by DHCP).

IP addresses are obtained directly from the kernel and always
match those configured on the interface, so we treat them as
authoritative and ignore addresses passed in via DHCP (by the
time DHCP passes them in we've already been notified by the
kernel anyway).

Since we now have multiple sources of link information (the
kernel for addresses and DHCP for routes and DNS, plus various
bits of static information), also move all the code that sets
mLinkProperties into one place. This allows us to be clearer
about who is authoritative for which parts of mLinkProperties.

Bug: 10232006
Change-Id: I4f262342379ce7fed172b67a1d403e3cd34f4232
ifiStateMachine.java
1ed7a0200ac705b20f71193030a59edd8361200b 05-Sep-2013 Vinit Deshapnde <vinitd@google.com> Fix duplicate SSID entries in the WifiSettings UI

The root cause is likely our 'no networks' problem; it caused people
to add new (and duplicate) entries to their list of networks; which
are haunting us now.

This change looks up the dupes, and discards them, even if they came
wifi supplicant.

Bug: 10633813
Change-Id: I656b6bf7240de6763bf84b5b406c50444af6dd48
ifiConfigStore.java
b402fb2fddbee48ef3b518358dc5c86db63f7780 05-Sep-2013 Vinit Deshapnde <vinitd@google.com> Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev
6a2d32597a3f158f4ff5b07ad61c7d892d08f3bf 04-Sep-2013 Vinit Deshapnde <vinitd@google.com> Rename LinkInfo to LinkQualityInfo

This change renames the LinkInfo objects to LinkQuailtyInfo. The API is
still hidden; but it can be accessed via reflection.

Bug: 10342372

Change-Id: Ieccea87c467ceae5d7f76298b137573f67396cd6
ifiStateTracker.java
fab5c2b28ede33879372e559f14648a83da8252e 30-Aug-2013 Vinit Deshapnde <vinitd@google.com> Synchronize access to single supplicant path

Both wlan0 and p2p0 state machines are accessing the supplicant socket
simultaneously; and may get responses of each other's command. This
change introduces synchronization between these two processes.

Bug: 10375978
Change-Id: I0ac0b2771311b642affc353958cc9ba2e5dd5716
ifiNative.java
48c47471061d7d5da15fa2b45ac7c8102bdf847e 28-Aug-2013 Vinit Deshapnde <vinitd@google.com> More elaborate logs to debug missing APs

Bug: 10375978

Change-Id: Ic9bb8f3a7a0684143e4e77f8da0d2c833293c94a
ifiConfigStore.java
ifiNative.java
ifiStateMachine.java
268f329521c0dcd697a671a643ed4cda17c452bd 27-Aug-2013 Sreeram Ramachandran <sreeram@google.com> Fix channel set option in wifi batch scan command.

Fix by not including extraneous delimiters, and changing the delimiter from a
space to a comma.

Bug: 10444428
Change-Id: Ia3197045d44a2f959316935ae085575500e65459
ifiNative.java
402334a09b367551f788d3fc397a3d26269ae756 26-Aug-2013 Vinit Deshapnde <vinitd@google.com> Merge "Fix an exception caused by incorrect data handling" into klp-dev
1f3ecaae6303d5ee6c5ca8499262c9962f036365 04-May-2013 Chong Zhang <chz@google.com> wifi-display: add certification options

When certification mode is enabled:

- Pass wfd session info to wifi display settings

- Allow sink to connect to source

- Add interface in display manager for pausing/resuming session

- Add interface in WifiP2pManager for setting lc, oc and starting
autonomous GO

Note that we're compliant regardless of certification mode, but
some confusing options (eg. allowing incoming connection from
sink) we want to hide when not being tested.

Bug: 9371882
Change-Id: Icc7dcae4e046453796cfa03f5f197055fabf234b
ifiNative.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
e8fabf98fb5e5543050679b4f4bff677bbc4164b 23-Aug-2013 Vinit Deshapnde <vinitd@google.com> Additional logging to debug lost Wifi APs

This change adds some in-memory logging to get some information that
doesn't seem to get captured in bug reports readily. We can remove this
after we've got to the bottom of this issue.

This is the sort of log it produces in bugreport -

WifiConfigStore - Log Begin ----
16:30:06 - loadConfiguredNetwork GoogleGuest
16:30:06 - loadConfiguredNetworks loaded 1networks
16:30:06 - disableAllNetworks
16:30:06 - loadConfiguredNetwork GoogleGuest
16:30:06 - loadConfiguredNetworks loaded 1networks
WifiConfigStore - Log End ----

Bug: 10375978
Change-Id: Iaecd3b391aea3711bf376d6cb520217d3242e6f1
ifiConfigStore.java
ifiMonitor.java
ifiNative.java
ifiStateMachine.java
e2a6d3df1257c1c04b1a14777bb7ee65f634bdc3 22-Aug-2013 Vinit Deshapnde <vinitd@google.com> Merge "Introduce network link quality statistics" into klp-dev
1f12cb52a494a3eaefc62d03a8d2fdf47a5535e9 21-Aug-2013 Vinit Deshapnde <vinitd@google.com> Introduce network link quality statistics

This change starts tracking traffic quality data for WiFi and mobile
networks. The quality is tracked based on incidental traffic, and not
on specific measurements. Theoretical bandwidths are hard-coded, as
well as sampling interval; although sampling interval can be changed
by setting a system policy.

Bugs filed to remove shortcomings of this change -

10342372 Change LinkInfo name to something better
10342318 Move hardcoded values of MobileLinkInfo to resources
so they can be updated without changing code

Bug: 10006249

Change-Id: I83d8c7594da20fe53abbd5e1f909b1f606b035bb
ifiStateTracker.java
4d0145add16bccb6b0f4a7d767a0b052f1b6bb04 19-Aug-2013 Vinit Deshapnde <vinitd@google.com> Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev
b676a4a70db36bdd6ce5060d16f453f797378098 17-Aug-2013 Vinit Deshapnde <vinitd@google.com> Expose WifiManager.setTdlsEnabled public API

Bug: 10221775

Change-Id: I559e4a2afd525a03c8a13fd151eca4638426d03e
ifiManager.java
b3acd8ef263e17879e9a13c3dacd123bd0670c3b 17-Aug-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "wifi: Do not use prefix for p2p commands" into klp-dev
d3135451b1091022264f15a17e0ac85ec8f0bf30 16-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Modify wifi BatchedScan." into klp-dev
bbabe1433361d83e4cabab80acdc839e437a8452 15-Aug-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Send event without prefix to p2p0

Bug: 9298955

Change-Id: I71037dd1cd60ee4efa75e1d6fab60a07bdf0626d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiMonitor.java
dda5a7152fd6e5933503aba8e8badbbba0631839 15-Aug-2013 Vinit Deshapnde <vinitd@google.com> Fix an exception caused by incorrect data handling

The prefixes in WifiEnterpriseConfig are optional, and should be treated
as such. If the prefix doesn't exist, it is possible for an
exception to be thrown (if the value size is smaller than prefix size).

Bug: 10304089

Change-Id: Id9b2bc0e371c818e35a5aa1913ee1697f167e19e
ifiEnterpriseConfig.java
8e628dadc321bf49e93e482540df87431d014b01 15-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Modify wifi BatchedScan.

Add pollBatchedScan API to allow forced retrieval.
Modified driver API, adding MSCAN, removing nextCount and making
the results look more like normal manual scan results.

bug:9301872
Change-Id: I58bce0624c36e2ad8d3c3f5defcb4d4e155dc8f9
atchedScanSettings.java
WifiManager.aidl
ifiManager.java
ifiNative.java
ifiStateMachine.java
2de3a5762f4c77852810d8f6de6b60aabee9a38e 14-Aug-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Do not use prefix for p2p commands

Bug: 9298955

Change-Id: I73dab83d133ab3a79cdf804764ba0583a6c9af7f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiNative.java
7a8d9d6fecb31124ad1ec349944659a2f5672776 14-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for batched wifi scans." into klp-dev
0451d59ba2d768e7653752028910f00a6c96e64e 02-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Add support for batched wifi scans.

bug:9301872

Change-Id: I5a7edfdbd2b78a65119d11acad491eae350c0870
atchedScanResult.aidl
atchedScanResult.java
atchedScanSettings.aidl
atchedScanSettings.java
WifiManager.aidl
canResult.java
ifiManager.java
ifiNative.java
ifiStateMachine.java
4b2766a3d8eaf6f7f50c05108c15010a3f275bde 13-Aug-2013 Vinit Deshapnde <vinitd@google.com> Fix a bug in single socket connection to Wifi Supplicant

My change to post messages without IFACE=<iface> prefix to all interfaces
was correct; but messages sent with IFACE=p2p-p2p0-0 et al were being sent
to p2p monitor only. This change mimics that to resolve some issues
introduced by the single socket change.

Bug: 10257602
Change-Id: Ia6164cb3cfd11c2a0a7b011eceaeabfd9677f62c
ifiMonitor.java
89d16f7597d9e03bf3cf9eb1ba91b590ab1ac892 09-Aug-2013 Wink Saville <wink@google.com> am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev

* commit '9b7b4450185e723dc7021f7e8bae4a12d4dd5606':
If in a mobile captive portal is detected enable fail fast.
9b7b4450185e723dc7021f7e8bae4a12d4dd5606 09-Aug-2013 Wink Saville <wink@google.com> am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev

* commit '02eab434ad9faa25291e63023b7e66698ca457a8':
If in a mobile captive portal is detected enable fail fast.
c249c2cc6b601ed1ff063f1748ba4399b9270209 08-Aug-2013 Vinit Deshapnde <vinitd@google.com> Use a single socket to communicate with supplicant

This helps to prepare for future updates from external sources.

Bug: 9298955

Change-Id: I4c63ad5fc1ea3564aab38cfce955de19bad75c0c
(cherry picked from commit fb40801ed8c217ae01082fb1cbd0c30bbf5532ac)
ifiMonitor.java
ifiNative.java
ifiStateMachine.java
2p/WifiP2pService.java
602b232a06ede86999aa362a12eb28cbc782dc1d 03-Jul-2013 Jason Monk <jmonk@google.com> Add PAC File support for proxy configuration

PAC (Proxy auto-config) files contain a single javascript function,
FindProxyForURL(url, host). It gets called to determine what proxy should be
used for a specific request.

This adds PAC support to the system. The ProxyProperties has been modified
to hold the PAC file when one is present. The Proxy method
setHttpProxySystemProperty has been modified to insert a PacProxySelector
as the default ProxySelector when it is required. This new ProxySelector
makes calls to the ConnectivityService to parse the PAC file.

The ConnectivityService and the WifiConfigStore have been modified to support
saving the extra PAC file data.

The ConnectivityService now has a class attached (PacProxyNative) that
interfaces to the native calls for PAC files. The parsing of the PAC file
is handled by libpac (which is being added to external/) which utilizes
libv8 to parse the javascript.

As a fallback to applications that don't use the java ProxySelector, the proxy
is setup to point to a local proxy server that will handle the pac parsing.

bug:10182711
Change-Id: I5eb8df893c632fd3e1b732385cb7720ad646f401
ifiConfigStore.java
ifiConfiguration.java
d747cbc898ef44e59c3fbf74a8327b6a12aad397 08-Aug-2013 Wink Saville <wink@google.com> If in a mobile captive portal is detected enable fail fast.

When captive portal checking completes pass back the result.
This is used to enable/disable failing fast for mobile. When
failing fast is enabled we don't check for data stalls and thus
won't be continually trying to do recovery operations, such as
restarting the radio.

Bug: 9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
ifiStateMachine.java
ifiStateTracker.java
e899d7c0297c499398252f736cb11ffe7ef4f2e3 02-Aug-2013 Elliott Hughes <enh@google.com> am 5d6b7db5: am 20c911ba: Merge "When wifi wants ASCII lowercasing, it needs to ask for it."

* commit '5d6b7db5d9cb7de5cee45dd35af18e179f01d583':
When wifi wants ASCII lowercasing, it needs to ask for it.
ee00b353a4070a9ddbdf67fa715dc84e7282f7c2 02-Aug-2013 Elliott Hughes <enh@google.com> When wifi wants ASCII lowercasing, it needs to ask for it.

http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67
ifiInfo.java
ifiStateMachine.java
2p/nsd/WifiP2pDnsSdServiceInfo.java
2p/nsd/WifiP2pServiceRequest.java
6942a1200cf8872e67e8e0a8ebc9e2e65531595b 26-Jul-2013 David Christie <dnchrist@google.com> Add WorkSource capability to WifiManager for starting a scan.

Change-Id: I011bf3b91fbddaba7ab0128bb03d27d90b8a886f
WifiManager.aidl
ifiManager.java
ifiStateMachine.java
5ab422bfa34f0fd64b6bef25287e7250f80de4ba 16-Jul-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Add tdls_discover command to tdls enable call

Bug: 8539031

Change-Id: I29739e74f73b68fbf9ff73cfc19017a01655f9a4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiNative.java
e08842840064801e32f33798c8ed6185c7d7650b 12-Jul-2013 Vinit Deshapnde <vinitd@google.com> Merge "Allow enabling TDLS on specific routes"
d76a6851a896e6708e9d5d8469ec1c0f97b99e79 12-Jul-2013 Robert Greenwalt <rgreenwalt@google.com> am 6f2b31fc: am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev

* commit '6f2b31fcf57e4e7f5cd8af9b66619c8f5825a850':
Block Wifi P2p discovery while doing dhcp.
6f2b31fcf57e4e7f5cd8af9b66619c8f5825a850 12-Jul-2013 Robert Greenwalt <rgreenwalt@google.com> am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev

* commit '56a7e4ad43eb5288a80b34566db365aaaa845e87':
Block Wifi P2p discovery while doing dhcp.
64f0d5ba158e9135bcd48d64a1c0db282a4628ba 12-Jul-2013 Vinit Deshapnde <vinitd@google.com> Allow enabling TDLS on specific routes

This change exposes couple of internal APIs to enable TDLS between local
machine and a remote machine. The implementation translates client provided
remote IP to a MAC address using system ARP cache, and then instructs the
driver to enable TDLS with that endpoint. Another API takes application
specified MAC address.

Bug: 8538898

Change-Id: Ida343fc42ba3a817a4f380255596e7fb7fcdfb9b
WifiManager.aidl
ifiManager.java
ifiNative.java
ifiStateMachine.java
6433ef29006cc151930dd9efdca82e6a4d2833e9 29-Jun-2013 Robert Greenwalt <rgreenwalt@google.com> Block Wifi P2p discovery while doing dhcp.

bug:9531609
bug:9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1
ifiStateMachine.java
2p/WifiP2pService.java
b8d116a580000f8c3f162da11a49b1bdc3705d97 09-Jul-2013 Vinit Deshapnde <vinitd@google.com> Flush scan results et al after band change

This change flushes all bss data after a band change (because it
is potentially invalid). We do scan for new data just after we've
established connectivity on the new band.

Bug: 7053587

Change-Id: I8ab9d0bbc5c3f8f383c2b7868349634085cf94c1
ifiNative.java
ifiStateMachine.java
505e35bca9e19773e42cb8771fcf36158208b8ab 26-Jun-2013 Robert Greenwalt <rgreenwalt@google.com> am c869696e: am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev

* commit 'c869696ef3c1dca3efbc6ce8ab804e8a1b117900':
Fix power issues around wifi scans.
c869696ef3c1dca3efbc6ce8ab804e8a1b117900 26-Jun-2013 Robert Greenwalt <rgreenwalt@google.com> am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev

* commit '65f7a95fc4c06127e7372bcb0d14e561cc23dd80':
Fix power issues around wifi scans.
89710842585404ea33f941afeb2c321e706005e9 25-Jun-2013 Robert Greenwalt <rgreenwalt@google.com> Fix power issues around wifi scans.

- Sending a broadcast indicating when scan requests could be serviced so that
apps don't request scans we won't do anything with.
- Fix our batt stats accounting so we only count it if we send the request to
the driver.

bug: 8868201
bug: 9496690
Change-Id: I64a4f1c294c848ac64c50d8854ed4a6a1a47f603
ifiManager.java
ifiStateMachine.java
e36b93575f14239ff38ea8b71e39e41b0312326b 21-Jun-2013 Iliyan Malchev <malchev@google.com> am 7bc28ed7: am e6345a19: am 9233fc00: Revert "Revert "wifi: Get full scan results""

* commit '7bc28ed76b9a6591bdda37b472c3f7dc1ffae987':
Revert "Revert "wifi: Get full scan results""
7bc28ed76b9a6591bdda37b472c3f7dc1ffae987 21-Jun-2013 Iliyan Malchev <malchev@google.com> am e6345a19: am 9233fc00: Revert "Revert "wifi: Get full scan results""

* commit 'e6345a19129484572d3200edfff7f002a4314d0b':
Revert "Revert "wifi: Get full scan results""
9233fc0023755e190e7c28374c5c6fa6558dec70 21-Jun-2013 Iliyan Malchev <malchev@google.com> Revert "Revert "wifi: Get full scan results""

This reverts commit c2cbd4c11bfb83344502bd80389538795bae03cb.

Change-Id: Ia1cbde588ae9706966d6340c702fcfe1a82cfa79
ifiNative.java
ifiStateMachine.java
9c5c31d2284f238b2a236959b8e33e42063121ef 19-Jun-2013 Iliyan Malchev <malchev@google.com> am 2a155213: am 66acbc22: am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev

* commit '2a155213c85f84a944551c09c0eefde3368267db':
Revert "wifi: Get full scan results"
2a155213c85f84a944551c09c0eefde3368267db 19-Jun-2013 Iliyan Malchev <malchev@google.com> am 66acbc22: am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev

* commit '66acbc221b750a645a1c9581f4a5bbe52e38729c':
Revert "wifi: Get full scan results"
c2cbd4c11bfb83344502bd80389538795bae03cb 17-Jun-2013 Vineeta Srivastava <vsrivastava@google.com> Revert "wifi: Get full scan results"

This reverts commit 67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.

Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713

Conflicts:
wifi/java/android/net/wifi/WifiNative.java
wifi/java/android/net/wifi/WifiStateMachine.java
ifiNative.java
ifiStateMachine.java
91268cf21eace600792d04db1ac62e9268f48002 14-Jun-2013 Dianne Hackborn <hackbod@google.com> More work on process tracking.

Re-arranged code to be more flexible, now track
state of services, dump ordered list of running
processes while memory was critical and low.

Also rename battery stats service from "batteryinfo" to "batterystats".

Change-Id: I0f4f0c8d443c49d255cb84d0fc917e8ec18b152e
ifiStateMachine.java
fea17de7aaa5729d3111102b2734b158403d2780 11-Jun-2013 Jeff Sharkey <jsharkey@android.com> Explicit locale when formatting machine strings.

Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
ifiSsid.java
2p/WifiP2pWfdInfo.java
2p/nsd/WifiP2pDnsSdServiceInfo.java
2p/nsd/WifiP2pServiceRequest.java
2p/nsd/WifiP2pUpnpServiceInfo.java
2p/nsd/WifiP2pUpnpServiceRequest.java
156cf401482c6274b419bf25255ba9bac35adf3f 01-Jun-2013 Robert Greenwalt <rgreenwalt@google.com> am 66c7bd54: am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev

* commit '66c7bd54046c567de5e3a4d332987a28ecb78092':
Remember wifi country that's set before boot
66c7bd54046c567de5e3a4d332987a28ecb78092 01-Jun-2013 Robert Greenwalt <rgreenwalt@google.com> am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev

* commit '0161d229fdbd8407f5b8b783ffa02b145b0cef8e':
Remember wifi country that's set before boot
304aad49cdd373f5081c7840f374baaf53122968 01-Jun-2013 Robert Greenwalt <rgreenwalt@google.com> Remember wifi country that's set before boot

Telehony seems to sometimes be reporting the country before boot
is completed so can't persist the data at that time. Remember
and write it on BOOT_COMPLETED

Also, there are permission issues around writing the setting.

bug:9225156
Change-Id: Ifdf2243da71b0d2ce5743267842597937d790ef5
ifiStateMachine.java
b61e757ffbe1c5cc05ca039f548ea4ce3bcb070f 29-May-2013 Robert Greenwalt <rgreenwalt@google.com> am 466ceb46: am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev

* commit '466ceb463f44f72bdd73764e50dcb34c174a0cfe':
Ignore outstanding delayed shutdown on restart
466ceb463f44f72bdd73764e50dcb34c174a0cfe 29-May-2013 Robert Greenwalt <rgreenwalt@google.com> am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev

* commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd':
Ignore outstanding delayed shutdown on restart
e9868c1ba05b6b8d3be94df1e5cbd0a5d016b0a7 29-May-2013 Robert Greenwalt <rgreenwalt@google.com> Ignore outstanding delayed shutdown on restart

This was causing us to go disabled when we shouldn't
so the API being tested in the CTS would fail. Bug
is timing dependent and hard to repro.

bug:9067887
Change-Id: I70b813bf826988d859cc29201242238f18dcf2e6
ifiStateMachine.java
fa0e6d523117e3d90a973ad42c1fe76325006635 23-May-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Use 'IFNAME=iface CMD' instead of 'CMD interface=iface Rest'

Change-Id: Iad7389a9030c9f8a697b147941a8f296db6eb08d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiNative.java
a75ab0337a2a020575968170d6baab4f96812cfa 19-May-2013 Robert Greenwalt <rgreenwalt@google.com> am c3de50cd: am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev

* commit 'c3de50cd3cff76082bc01b04a8a6bbde300d725e':
Add some temp wifi debugging output
c3de50cd3cff76082bc01b04a8a6bbde300d725e 19-May-2013 Robert Greenwalt <rgreenwalt@google.com> am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev

* commit '30c798d58772efd595fffebd9d0d54f717e34ed6':
Add some temp wifi debugging output
02ba86f0cc34fcaaf5e938f178c9d0ff86c8dba0 18-May-2013 Robert Greenwalt <rgreenwalt@google.com> Add some temp wifi debugging output

bug: 9014777
Change-Id: I38c61f235742a36be10cdf9125e19ac9406a61b9
ifiStateMachine.java
a67a1f5ae0acae8499c1e6dfe795c92a688f1ada 13-May-2013 Robert Greenwalt <rgreenwalt@google.com> am 23abefef: am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev

* commit '23abefef00b4d47bb97b2597f74c9dae6a169286':
Remove wifi scan-always dialog.
23abefef00b4d47bb97b2597f74c9dae6a169286 13-May-2013 Robert Greenwalt <rgreenwalt@google.com> am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev

* commit '28d3dbf969c4c7965ea44bfe4b54095af5356970':
Remove wifi scan-always dialog.
28d3dbf969c4c7965ea44bfe4b54095af5356970 13-May-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove wifi scan-always dialog." into jb-mr2-dev
aee3d28763230e54d9ce250c17744858e79bf798 13-May-2013 Robert Greenwalt <rgreenwalt@google.com> Remove wifi scan-always dialog.

Removes intent type for dialog and Setting on whether to show
dialog.

bug:8907190
Change-Id: Id37e03126d4afdfd7d921132a57233b84603c8bd
ifiManager.java
77a0c9d7bc664ac9b367da082fd5134b4ae653fe 11-May-2013 Dmitry Shmidt <dimitrysh@google.com> am b4fd1bd7: am de1361fa: Merge "P2P: Turn OFF PS-mode for DHCP session" into jb-mr2-dev

* commit 'b4fd1bd7748d2df00ec0792d3419aa79c742f979':
P2P: Turn OFF PS-mode for DHCP session
b4fd1bd7748d2df00ec0792d3419aa79c742f979 11-May-2013 Dmitry Shmidt <dimitrysh@google.com> am de1361fa: Merge "P2P: Turn OFF PS-mode for DHCP session" into jb-mr2-dev

* commit 'de1361fa12cef43cc97e98321408e1c4c5e44b38':
P2P: Turn OFF PS-mode for DHCP session
de1361fa12cef43cc97e98321408e1c4c5e44b38 11-May-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "P2P: Turn OFF PS-mode for DHCP session" into jb-mr2-dev
e25f9d246ee1f0487d39c9cc7edbadb2d355a6e1 11-May-2013 Dmitry Shmidt <dimitrysh@google.com> P2P: Turn OFF PS-mode for DHCP session

Bug: 8494584

Change-Id: I1d7519a40342538ab31ccad6210e47b3622ae31e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2p/WifiP2pService.java
c77e2d74eef530c873cb5d9d37f5301326015b6e 11-May-2013 Robert Greenwalt <rgreenwalt@google.com> Fix for P2P GO beaconing when 4way Handshake fails

bug:8871100
Change-Id: I01276f13bfdd4bc23771414935d2a370223bf4fa
2p/WifiP2pService.java
ed268e7fd4c05f0690297c92abb2ba1e8a8eea88 11-May-2013 Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> am 509b51aa: am 00ee47ea: Merge "framework/base: Handle ASSOC-REJECT events"

* commit '509b51aa2560d47bcf64d63a1347b7ba8136450e':
framework/base: Handle ASSOC-REJECT events
1483631c2f1fdacafd5b1c5c8c73721e21e2174b 11-May-2013 Robert Greenwalt <rgreenwalt@google.com> am a62fbd31: am 408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails."

* commit 'a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee':
frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
dfbf21e5914b5f45627c4c6af0bad8c840c79f92 11-May-2013 Robert Greenwalt <rgreenwalt@google.com> am 6f8fb959: Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks"

* commit '6f8fb9594fa5387340601c8b6e3e13f51e57f54b':
Enable Opportunistic Key Caching on WPA2-Enterprise Networks
509b51aa2560d47bcf64d63a1347b7ba8136450e 11-May-2013 Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> am 00ee47ea: Merge "framework/base: Handle ASSOC-REJECT events"

* commit '00ee47ead451ee2584c23f15a3760ae041e82e56':
framework/base: Handle ASSOC-REJECT events
6f8fb9594fa5387340601c8b6e3e13f51e57f54b 11-May-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks"
00ee47ead451ee2584c23f15a3760ae041e82e56 11-May-2013 Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> Merge "framework/base: Handle ASSOC-REJECT events"
a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee 11-May-2013 Robert Greenwalt <rgreenwalt@google.com> am 408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails."

* commit '408ad99dd307ae93abec76821d343b8e080c99c9':
frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
ee011077df0b0cf3d6942bd6df011ea1e25c3db6 07-May-2013 Partha N <parthan@gmail.com> Enable Opportunistic Key Caching on WPA2-Enterprise Networks

Add a "proactive_key_caching=1" line to every network segment config that represents a
WPA2-Enterprise network. This enables Opportunistic Key Caching for all eligible
WLANs.

Replaced TABs with spaces.

Change-Id: Ia529dcd1dee7a21a68c80de05a9f590ddd944d4c
Signed-off-by: Partha N <parthan@gmail.com>
ifiEnterpriseConfig.java
c1b631e757999232674e53e9a1bc21abed6b1862 30-Apr-2013 Deepthi Gowri <deepthi@codeaurora.org> framework/base: Handle ASSOC-REJECT events

Disable current network and enable other saved networks(if any)
once number of ASSOC-REJECTs on an attempt to connect to a corresponding
network exceeds the threshold.

Change-Id: Iac3c1596aa800d93c55b0ac5d8070a058c3842bd
upplicantStateTracker.java
ifiConfiguration.java
ifiMonitor.java
ifiStateMachine.java
975b788dab020335e81fd7a9da09c8889a0bd1b1 06-Mar-2013 Deepthi Gowri <deepthi@codeaurora.org> frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.

Fix for P2P GO beaconing when 4-way Handshake fails by setting
p2p_group_idle timeout of 10 sec when group is started as a GO
and clear it when AP_STA_CONNECTED event is received.

Change-Id: I40189efc31eeb55e01a95a2a8e9c1a95d929952d
bug: 8871100
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2p/WifiP2pService.java
8d06e430307d07e3d51f381b4c7c89f7d9155133 07-May-2013 Partha N <parthan@gmail.com> Enable Opportunistic Key Caching on WPA2-Enterprise Networks

Add a "proactive_key_caching=1" line to every network segment config that represents a
WPA2-Enterprise network. This enables Opportunistic Key Caching for all eligible
WLANs.

Change-Id: Ia529dcd1dee7a21a68c80de05a9f590ddd944d4c
Signed-off-by: Partha N <parthan@gmail.com>
ifiEnterpriseConfig.java
e325e416d65bdc1f7b17d584dfd1c463d07ed5ba 01-May-2013 sunil duttu <duttus@codeaurora.org> framework: When turn off of SoftAp immediately call turning ON SoftAp

Due to sub system restart, there is state change of softAp tether state
machine in tethered state triggering turnoff SoftAp this should be
follwed by turnon softap.

Change-Id: I7fbc87ff270d0d720f06ae3697a1ce81f8444ee0
ifiStateMachine.java
aff3bd69d35a959c8139ef45f104d5d3d0f9bf46 06-Mar-2013 sunil duttu <duttus@codeaurora.org> framework:When turn off of SoftAp immediately call turning ON SoftAp

Due to sub system restart,There is state change of softAp tether state machine
in tethered state triggering turnoff SoftAp this should be
follwed by turnon softap.

Change-Id: I93051f17bcaae72ae0694f1f23557cc1d3bea280
ifiStateMachine.java
cca308e3e841731662d3ceacf3c631ce5ecf8fb2 26-Apr-2013 Irfan Sheriff <isheriff@google.com> Fix network reload when config is restored

With scan mode opted in, supplicant connection is not shut
down even when wifi is turned off. This is a problem since
networks need to be reloaded when wifi is turned off and turned on
and this currently happens only on a supplicant connection.

Fix to handle this for scan mode state.

Bug: 8714796
Change-Id: I7d66c39fb51018fb52e783341222cea993993893
ifiConfigStore.java
ifiStateMachine.java
4a1d95139a57b8726fb168b08a5c54b9a134c8df 19-Apr-2013 Irfan Sheriff <isheriff@google.com> Merge "Fix NPE issues seen by CTS" into jb-mr2-dev
63e550f2026e749e7be5ab03655f0a5105457b9e 19-Apr-2013 Irfan Sheriff <isheriff@google.com> Merge "Add getters and private constructor" into jb-mr2-dev
0b4732c2248fa2b92a44f045dfcadb3547076ef4 19-Apr-2013 Irfan Sheriff <isheriff@google.com> Fix NPE issues seen by CTS

Bug: 8646305
Change-Id: Ief90c76d63f60aee9a3da080cd43dd9610f3f4fc
ifiEnterpriseConfig.java
40843589c46164c90fde29ad1c58291f17d4d9e6 19-Apr-2013 Irfan Sheriff <isheriff@google.com> Add getters and private constructor

Address API feedback

Bug: 8656930
Change-Id: Idc3dd8d8a7e633449329864e41cab58a6b193b5a
ifiEnterpriseConfig.java
ba1311a3f64efc9f22dea1ab5477002751e478dc 19-Apr-2013 Irfan Sheriff <isheriff@google.com> Merge "Fix API name" into jb-mr2-dev
7ea33eac4b57aabf9326d60f52e3ed85217ac846 19-Apr-2013 Irfan Sheriff <isheriff@google.com> Fix API name

Address council feedback

Bug: 8656932
Change-Id: I92972fc3672afbc38cdeee628c04b639053f7cf3
WifiManager.aidl
ifiManager.java
d12a7645a3bf3ffa83b8041bf343f1dc12a2381f 17-Apr-2013 Irfan Sheriff <isheriff@google.com> Merge "Fix enabling networks after driver stop" into jb-mr2-dev
b8df5451f416db17dc4c7d5a7e106a861b11ac0a 16-Apr-2013 Irfan Sheriff <isheriff@google.com> Fix enabling networks after driver stop

Bug: 8630194
Change-Id: If897fc1fe54bf2f35362b8482e56d98f80a3130c
ifiStateMachine.java
ed8cdbb780cda3701b433dd1d383bb88f180ff72 16-Apr-2013 Irfan Sheriff <isheriff@google.com> Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev
0b132962e4e324ca3b37f845d0792226d4f94d27 16-Apr-2013 Irfan Sheriff <isheriff@google.com> Fix CTS failure due to invalid EAP update

Update EAP only when it has valid entry

Bug: 8604987
Change-Id: Ib6b10bd06c26ee91c4ecd3a231b509d728725dfc
ifiConfigStore.java
b2c0ff64d8ff92dab53e969a44fa12427d145952 13-Apr-2013 Kenny Root <kroot@google.com> Remove old KeyStore call sites

Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.

Bug: 8122243
Change-Id: Ifbd178fddbf8dbd8f7b821ea739a20d056ef9fa7
ifiEnterpriseConfig.java
a05e4583af6d43f5d19fd6f508501bc43ccfcd5b 05-Apr-2013 Robert Greenwalt <rgreenwalt@google.com> Disconnect from AP when teardown requested.

We can leave the driver running if it can't handle quick
start/stop cycles, but we must disconnect when requested.

Bug:8549078
Change-Id: Id2e930fb48ca78bb459b775cba7e9aa31a6c9941
ifiStateMachine.java
08b1ad435f0d98fb5a43b9eb91c17f6d36a06bb4 12-Apr-2013 Irfan Sheriff <isheriff@google.com> Fix WPS handling when already connected

Dont enable networks too quickly

Bug: 8558120
Change-Id: Ibee1ae393d56e532227505d0393a9a337f72f62f
ifiStateMachine.java
51e4ece385c6c34d97d5fa2dcc8e3b2c0bae7c22 28-Mar-2013 Irfan Sheriff <isheriff@google.com> Fix proxy and IP settings

- Network disconnect was clobbering IP and proxy settings.
- Track settings correctly in WifiConfigStore

Bug: 7299216
Change-Id: I30e5b68e59e30f7b99a71e8d7cf18750c784cec7
ifiConfigStore.java
ifiStateMachine.java
4b8fabd5a87828d676b1f9547fdaedcaeac39c6a 09-Apr-2013 Robert Greenwalt <rgreenwalt@google.com> Fix crash bug with mismatched iface names

The copied-to LinkProperties needs the same iface name as the copied from.
Since we were copying into an empty LP this was trivial, but I
changed the params to tighten up this contract - don't want to
accidentally change an LP's iface name when we shouldn't.

bug:8569797
Change-Id: I5f88826e37271a0549c14d004bb2f16983b950e6
ifiConfigStore.java
964a6a7e209b0db262c827721ae5fde3f98ca763 29-Mar-2013 Irfan Sheriff <isheriff@google.com> Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev
ce449d9ee521052bb6c24885a3599a19841eae5d 28-Mar-2013 Irfan Sheriff <isheriff@google.com> Merge "Add support for setMiracastMode" into jb-mr2-dev
8b485adffd7eaa7b7cab4c444b3d65097ef40a14 28-Mar-2013 Irfan Sheriff <isheriff@google.com> Add support for setMiracastMode

Usage is setMiracastMode(WifiP2pManager.MIRACAST_SOURCE) or
setMiracastMode(WifiP2pManager.MIRACAST_SINK) as an example.
Only available for internal use and can be called as long as
driver is active. P2p connection is not needed for it to be
called

Bug: 8493089
Change-Id: I1f87eaf3311212aae980077de26c05651a8cc811
ifiNative.java
2p/IWifiP2pManager.aidl
2p/WifiP2pManager.java
2p/WifiP2pService.java
665e1aed5e99af1e66af56c0d73e32fd86f57273 22-Aug-2012 Robert Greenwalt <rgreenwalt@google.com> Add BT - DataTracker connection

Allows the external BT stack the means to communicate with
ConnectivityService during reverse tethering.

bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
ifiStateTracker.java
81196b207a63bce1a430752db74a65e2a2be6d80 26-Mar-2013 Irfan Sheriff <isheriff@google.com> Fix clearing linkproperties on disconnect

Bug: 5472644
Change-Id: If2b32b16fd3d65f1da12a9c5a8083d50125283d5
ifiStateMachine.java
8b643c13f97c0f304a45039b9d1fe6900940499e 22-Mar-2013 Irfan Sheriff <isheriff@google.com> Scope certs for wifi UID and handle migration

Bug: 8183303
Change-Id: I842c9b0c0d4f2fa42a3fc5b1ac22c28e202ef188
ifiConfigStore.java
ifiEnterpriseConfig.java
7b7beb7952440ee2e255694b7b19e60abae93dc0 21-Mar-2013 Irfan Sheriff <isheriff@google.com> Notify user when wi-fi is toggled about scans

We let the user know when he turns off Wi-Fi that scans will continue to
be available.

User has the option to turn off the dialog and not receive this in the future.

Bug: 8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0
ifiManager.java
63f1e2fb6b7102490b11523589b82c2101d3c079 20-Mar-2013 Irfan Sheriff <isheriff@google.com> Merge "Add API to control scan always mode" into jb-mr2-dev
1ef840cdc785d0e8a07e317cc1d7af42a0d0185d 13-Mar-2013 Irfan Sheriff <isheriff@google.com> Add API to control scan always mode

Bug: 8141918
Change-Id: I1e5e45e514726c2cbfd86e747123e477e00fd7ed
WifiManager.aidl
ifiManager.java
367a96b0f314a3818911fee2b90854ffb511bb75 18-Mar-2013 Irfan Sheriff <isheriff@google.com> Fix tethering

Using sendMessageAtFrontofQueue() causes issues here since there can be a start
that is deferred and it basically has no effect. Use defer which is more clean
and obvious here.

Bug: 8410547
Change-Id: I4fbf299283847e7c3009b87a81cb56e765b0e1e1
ifiStateMachine.java
69edd64d9bf839428ce0a7723cd0f1deda98dc0d 07-Mar-2013 Lorenzo Colitti <lorenzo@google.com> Add stacking to the NetworkStateTrackers.

Bug: 8276725
Change-Id: I55a107fea78f9cc84f15bd6c75292138fb35a1b6
ifiStateTracker.java
b630b7e426aba74bb6064afe5837472efee32363 14-Mar-2013 Irfan Sheriff <isheriff@google.com> Fix tether restart on settings change

Bug: 8320043
Change-Id: I35d84c5b0ff2b9cc62d77b7fb6a9b9076f2cb695
ifiStateMachine.java
e6db500b1050b4040e04926b5473cd6872cf71b4 14-Mar-2013 Irfan Sheriff <isheriff@google.com> Fix msg argument usage

Change-Id: I5b38dcbae3918a1e8c828d6e246eadf520d06c06
ifiWatchdogStateMachine.java
11aefad94de6569c4c7394e7bc5fdeb0ae60d5bb 06-Mar-2013 Irfan Sheriff <isheriff@google.com> Add support for scan always available mode

Modify WifiService to add a controller to track the various
desired states and let the WifiStatemachine actually control
the bring up.

Bug: 8141918

Change-Id: I6e98fd5a29b43c3c50c315eff5255cd0a3eaebcd
WifiManager.aidl
ifiConfigStore.java
ifiStateMachine.java
accec86ce4fc49f1c8031ea7422156195e20c286 11-Mar-2013 Irfan Sheriff <isheriff@google.com> Fix reconnect/reassociate handling

We are dropping incorrectly when in disconnected state

Bug: 8357624
Change-Id: I8919dcd679da6b5fc6c7f671e243f08e42b91ff3
ifiStateMachine.java
0ffc81c1ada65b4ef4febaacf044e9fa62309b87 06-Mar-2013 Irfan Sheriff <isheriff@android.com> am 17d89636: am 011b8efc: Merge "frameworks/base: stop find before issuing wps pbc."

* commit '17d89636530f4a5e4e77d3ae11e2e696a697cc64':
frameworks/base: stop find before issuing wps pbc.
575bb45e9d293c8fd4fe7667439a748f856209a8 22-Feb-2013 Deepthi Gowri <deepthi@codeaurora.org> frameworks/base: stop find before issuing wps pbc.

Stop p2p find before issuing a PBC to avoid GO switching to other
channel leading connection failure.

Change-Id: I88906f944de1c85b143f96cb7b35724af19cd151
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2p/WifiP2pService.java
c7ede61f592a2389790ce0993b8ee0a16de54b5e 05-Mar-2013 Irfan Sheriff <isheriff@google.com> Merge "Fix client tracking" into jb-mr2-dev
c808a1955f7571108e8c22502897ed82c69a7c3b 05-Mar-2013 Irfan Sheriff <isheriff@google.com> Fix client tracking

Bug: 8311559
Change-Id: I167fcdd5c3da4d46b7d99e18041036023c8c60f7
ifiManager.java
fd7adc58ec9564f3bfbbcf0f32c6b509807c1117 04-Mar-2013 Irfan Sheriff <isheriff@google.com> Clean up statemachine

- Remove a few unnecessary states. Driver is part of kernel for all devices.
- Clean up some logs

Change-Id: Id067bd944fcb01a279485b8fb3251c92a6894c55
ifiNative.java
ifiStateMachine.java
d2bfa3bdc0a5d3c06cde2711d8572a8141e45fe2 04-Mar-2013 Irfan Sheriff <isheriff@google.com> Merge "Fix copy constructor" into jb-mr2-dev
90082124aaf66916da0a9f9bfb695caa74734b0f 04-Mar-2013 Irfan Sheriff <isheriff@google.com> Fix copy constructor

Bug: 8300712
Change-Id: If1c41a9fe35ca5950382ffcc5759fc14641d0b04
2p/WifiP2pWfdInfo.java
bca462a2dcf19c404fb445c6b4d703fea040955f 01-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Add checking for scan results EOB

Change-Id: I969079b72fdffe1b84d88242caa6b6281d1f02b1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiStateMachine.java
14b628a3400b6c36e0604f403dd72553c6fe63c2 01-Mar-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Add delimiter flag into bss scan results request

Change-Id: I2989ef1ee884db6add0405f36b628701aa928f69
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiNative.java
ab3b9fbfa0523e036ec71888d0da5dc55cd3301b 27-Feb-2013 Irfan Sheriff <isheriff@google.com> Fix concurrency issues

Make true copy of list when passing off on broadcast

Bug: 8212369
Change-Id: Iaf4a303513d267f76bd16b845ec68baabfca6b45
2p/WifiP2pDevice.java
2p/WifiP2pDeviceList.java
2p/WifiP2pService.java
be1a8cda3e8113d1fd3a6e56d8bc6c4f2d350423 27-Feb-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Fix scan results merge

Change-Id: I1fd6ce9cfe2966902696f5eaf58bf97086772ed4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiStateMachine.java
67b3fbf49c0c92641e19e3278a1feab7b68aa7b8 26-Feb-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Get full scan results

BUG: 8236341

Change-Id: Ic0b769eed6bfcdc12644bf461060d3e42ab18e86
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiNative.java
ifiStateMachine.java
302b06de7ea7ac97ac4a2189213a1133220bfdc8 22-Feb-2013 Irfan Sheriff <isheriff@google.com> Fix leak in WifiManager

Avoid leaks from having a channel connection per manager instance

Bug: 8254124
Change-Id: I10de91d7e5a775bc14bbab245734717d3b2f90d5
ifiManager.java
bcc97ca43a339c3356b5c8d9eaf1cbdfb0de3165 21-Feb-2013 Irfan Sheriff <isheriff@google.com> Clean up scan handling

Remove obsolete active/passive scan handling - drivers always
do active scan.

Also, remove AP_SCAN hack for preventing connections and use
the TYPE=ONLY scan.

Bug: 8158647
Change-Id: I8f70e19219ad789b7501a40529bcd6b6524739e8
WifiManager.aidl
ifiManager.java
ifiNative.java
ifiStateMachine.java
b815edf3aba63c2cd46f3ceb243ed13192102940 05-Feb-2013 Irfan Sheriff <isheriff@google.com> Track keys per config and allow cert push from apps

Allow configuring keys for a configuration and update/delete
from wificonfigstore.

Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
ifiConfigStore.java
ifiConfiguration.java
ifiEnterpriseConfig.java
b07526fb1c2b5b045fefccd5f2ab6be229aa34d6 17-Jan-2013 Irfan Sheriff <isheriff@google.com> eix enterprise config storage bugs

Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.

Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.

Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
ifiConfigStore.java
ifiEnterpriseConfig.java
2f6778c038e71fd0f857fcd9d0f0412598c69fa6 15-Jan-2013 Irfan Sheriff <isheriff@google.com> Fix build

Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
ifiEnterpriseConfig.java
c72c5625c69595501cb888f6086979abf7fd6161 11-Jan-2013 Irfan Sheriff <isheriff@google.com> Refactor enterprise config

Change-Id: I7104250e80317fce6164385701a7caffbcd14813
ifiConfigStore.java
ifiConfiguration.java
ifiEnterpriseConfig.aidl
ifiEnterpriseConfig.java
fdc028383a01eaaa9bf93cb5d3ce50bd744eab52 08-Feb-2013 Irfan Sheriff <isheriff@google.com> Expose EAP config API

This API allows apps to setup access to enterprise Wi-Fi networks.

Change-Id: I37573d76b8bd9cad72413afdc4fc62ce57b4dc43
ifiConfiguration.java
ifiEnterpriseConfig.java
f9d2c2e63a3c8af5c230a24a3f243c94011bf2b7 12-Feb-2013 Irfan Sheriff <isheriff@google.com> Merge "Track keys per config and allow cert push from apps"
702b42dd7415a88e876d4bacb1b543579548c607 12-Feb-2013 Irfan Sheriff <isheriff@google.com> Merge "Fix NPE"
9dab7d670537eb6a954d8e933c1deade87dfd981 12-Feb-2013 Irfan Sheriff <isheriff@google.com> Fix NPE

Supplicant sometimes reports 00:00:00:00:00:00 as group owner address causing
an NPE.

Avoid updating from peer list and let connection continue since group owner
address is not essential for data transfer to continue.

Bug: 8158711
Change-Id: I06ce88d7fb426fec4965087968f738dd2a7a7799
2p/WifiP2pService.java
26d0076f0dbb021c4e5cc1b37b632b2223fd9278 05-Feb-2013 Irfan Sheriff <isheriff@google.com> Track keys per config and allow cert push from apps

Allow configuring keys for a configuration and update/delete
from wificonfigstore.

Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
ifiConfigStore.java
ifiConfiguration.java
ifiEnterpriseConfig.java
44b31182e141c2a72432a7131c1497d84c2bb50a 06-Feb-2013 Irfan Sheriff <isheriff@google.com> Allow null serverAddress

Bug: 7993077
Change-Id: Id54d517c330b73ce5799c9dc9bc00226a9e71e14
ifiStateMachine.java
77a0ce12330cc4c66b6346c18d666cd8bf0734f6 05-Feb-2013 Irfan Sheriff <isheriff@android.com> am 3274e60a: am ac20bf1f: am 43a601e7: Merge "Change default intent"

# Via Android Git Automerger (2) and others
* commit '3274e60a47c9333080fb094e4c91094e3f3cd10c':
Change default intent
c4e9e753f469146bcb1a505061496f5d201bbea8 04-Feb-2013 Irfan Sheriff <isheriff@android.com> Change default intent

Older JB releases have a bug handling persistence invocation. One work
around right now is to have the newer release (with persistence)
use a lower intent value to allow older release to operate in group
owner mode.

Change-Id: I7ffb66081a352929a6f421e5d6141f592be7d472
ifiNative.java
2602030a007d902ace3fc573b2820cee31eefc95 28-Jan-2013 Wink Saville <wink@google.com> Merge "Add protected log methods to StateMachine"
58c73c3f76c231cf128041aefadd4b6a6bcefac2 28-Jan-2013 Wink Saville <wink@google.com> Add protected log methods to StateMachine

This allow child classes to Override the logging and
have consistent behavior across StateMachines.

Change-Id: I7e23a44d08ca304ade2d7830fd0e307f63f1879e
ifiStateMachine.java
ifiWatchdogStateMachine.java
2p/WifiP2pService.java
b9781fe08c5b1afba086857aa18b46862550ae88 25-Jan-2013 Dianne Hackborn <hackbod@google.com> Merge "App ops: you can now turn off operations."
5e45ee6752528791deb66b83d76250685de15d47 25-Jan-2013 Dianne Hackborn <hackbod@google.com> App ops: you can now turn off operations.

Also add new ops for calendar and wi-fi scans, finish
implementing rejection of content provider calls, fix
issues with rejecting location calls, fix bug in the
new pm call to retrieve apps with permissions.

Change-Id: I29d9f8600bfbbf6561abf6d491907e2bbf6af417
WifiManager.aidl
ifiManager.java
526603b1d8404432256b03507187f50c6b21b31d 25-Jan-2013 Irfan Sheriff <isheriff@android.com> am 441a90dc: am 3a0acc03: am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."

# By Yoshihiko Ikenaga
# Via Android Git Automerger (2) and others
* commit '441a90dc72d05082f0d1a4b227d48420a0b99a54':
Fix WPS configuration method of BSS enrollee.
1201dd9b7043bde8f1ed5d6c34425528783352cd 24-Jan-2013 Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com> Fix WPS configuration method of BSS enrollee.

Remove keypad from WPS configuration method of BSS enrollee
becuase JB UI does NOT support keypad, only supports pbc and
display.

Change-Id: I9ab6f1514805e8307b46e38261f1c657568aeb59
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
ifiStateMachine.java
b3608ad87739a8ec087a498d8c9397caf01f7738 19-Jan-2013 Irfan Sheriff <isheriff@google.com> Merge "eix enterprise config storage bugs"
e095675c872f40f630aa3f9189eb5c02f3cfee6d 17-Jan-2013 Irfan Sheriff <isheriff@google.com> eix enterprise config storage bugs

Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.

Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.

Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
ifiConfigStore.java
ifiEnterpriseConfig.java
8217635056efa9fb285bd4a0eb26a1789c5cd557 15-Jan-2013 Irfan Sheriff <isheriff@google.com> Merge "Fix build"
86ee9640ee6d6bd9bb655af830eea5515400f25b 15-Jan-2013 Irfan Sheriff <isheriff@google.com> Fix build

Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
ifiEnterpriseConfig.java
92325abb2c07e8499d88b92cf262955aba6f1e54 15-Jan-2013 Irfan Sheriff <isheriff@google.com> Merge "Refactor enterprise config"
9b81319002634cf7118055f7aafaa26c27d4e5e8 11-Jan-2013 Irfan Sheriff <isheriff@google.com> Refactor enterprise config

Change-Id: I7104250e80317fce6164385701a7caffbcd14813
ifiConfigStore.java
ifiConfiguration.java
ifiEnterpriseConfig.aidl
ifiEnterpriseConfig.java
aa621bf26ff4c967993878b7787c45e6bdd7af6d 09-Jan-2013 Wink Saville <wink@google.com> Use readUnsignedByte.

To remove any doubt about how java is doing its byte/integer arithmetic
use readUnsignedByte instead of readByte.

Change-Id: I5bdc200ed0cda51ad739804ac1d8d13c043424ec
2p/nsd/WifiP2pServiceResponse.java
f118043ca726c65f04cddc6321c9e820b577fc6f 13-Dec-2012 Irfan Sheriff <isheriff@google.com> P2p cleanup

- Clean up handling of mSavedPeerConfig
- Add argument protection
- Split out WPS handling on GO into a separate API. This was almost hacky
right now for applications and was working in an undocumented way
- Refactor connect function call and fix updating group capability

Change-Id: I26211c72ad60c6b6c939ad7473fcf2fc633f3010
2p/WifiP2pConfig.java
2p/WifiP2pDeviceList.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
3a67e2515bff73fab57621b1f9966662e83b7881 08-Dec-2012 Irfan Sheriff <isheriff@google.com> Expose more details in broadcasts

Expose details in broadcasts and do the necessary clean up alongside

Change-Id: I9011d51675a233aa3542f097c8a489c2095103b1
2p/WifiP2pDevice.java
2p/WifiP2pDeviceList.java
2p/WifiP2pGroup.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
42b1b564b63fa9c93df894ac8eca8db68fd5c435 06-Dec-2012 Irfan Sheriff <isheriff@google.com> Merge "Remove exposing dialog handling to apps"
88b41a589d38f7d230e9290e337fb8cb99c36c2e 06-Dec-2012 Irfan Sheriff <isheriff@android.com> am 46e38079: am c602187e: Merge "Prevent scanning during DHCP process"

* commit '46e380795216c58acbd38af532ac1626e105866a':
Prevent scanning during DHCP process
ef96a43a3c9277a2b63cce5ead0618281ac263b1 06-Dec-2012 Irfan Sheriff <isheriff@google.com> Remove exposing dialog handling to apps

This was a hidden API that has little value in being exposed due to
persistence now being supported on the platform.

The only use case for this is NFC, and we are going to add support
for that in official way

Change-Id: I20d97c8fd81e50fc610b4983b613e26ebaa72578
2p/WifiP2pManager.java
2p/WifiP2pService.java
c602187e51aa6e8c46bffa5fb2603e368d83ea95 05-Dec-2012 Irfan Sheriff <isheriff@android.com> Merge "Prevent scanning during DHCP process"
a5c6166c956f2471c688de78b408bfad241a173d 03-Dec-2012 Irfan Sheriff <isheriff@android.com> am 9648a484: am cdd03f54: Merge "Try go-negotiation when invocation request is deferred."

* commit '9648a484e0f5e0d90c76e83b2ec6a12dec1e3d83':
Try go-negotiation when invocation request is deferred.
cdd03f5487d3d0a088651c90fc5122b5fc3f62b3 03-Dec-2012 Irfan Sheriff <isheriff@android.com> Merge "Try go-negotiation when invocation request is deferred."
d7fc38cead0d1da007834214eba102b294f7923c 04-Sep-2012 Vitaly Wool <vitaly.wool@sonymobile.com> Prevent scanning during DHCP process

Wi-Fi should be in active state during the entire DHCP process, and
shouldn't go to IEEE 802.11 power save mode. If the framework requests
scan during the DHCP process, the Wi-Fi chip has to start scanning
on channels different from the current one, and going to power save
mode is a prerequisite for scan. The result directly impacts user
experience: DHCP process takes longer, and even can fail.

Change-Id: I8171388bb70072e4c42cb3c074dd955da84e494b
ifiStateMachine.java
8575c6637f2b6a70fca0c862e393fb311c01129a 01-Dec-2012 Irfan Sheriff <isheriff@google.com> Merge "Cleanup logging"
f0afe4144d09aa9b980cffd444911ab118fa9cbe 30-Nov-2012 Irfan Sheriff <isheriff@google.com> Cleanup logging

Change-Id: Ieea19853c069266b55cad80cce3743b5ba91218a
upplicantStateTracker.java
ifiConfigStore.java
ifiStateMachine.java
ifiWatchdogStateMachine.java
2p/WifiP2pService.java
38ddedc8adfc4d58f4bebe4a51149e4768d42f70 30-Nov-2012 Irfan Sheriff <isheriff@google.com> Merge "Support for dumping transition only messages"
ef8da9fe0b70fdbbb54bb0645ac66f75f58f31b8 29-Nov-2012 Irfan Sheriff <isheriff@google.com> Support for dumping transition only messages

Change-Id: I4968e28334f9dd49bd8fb81d04b25d62ca6da300
ifiStateMachine.java
9348005545403037ab1b93aea6f52055516377bf 16-Nov-2012 Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com> Try go-negotiation when invocation request is deferred.

Devices setting persistent_reconnect to 0 in wpa_supplicant returns "information is currently unable" error.
In that case, the connection establishment was always failed when the other device does NOT handle the invitation request.
So, try go-negotiation for interoperability.

Change-Id: Ia30a1c63d1bb4acc186a71248fb0aa5ea7edc627
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2p/WifiP2pService.java
b637322fd0dbf9402d84bedee891b813728656c0 27-Nov-2012 Irfan Sheriff <isheriff@android.com> am a80b9954: am 10c29234: am 13fd8919: Merge "Fixed typo and space."

* commit 'a80b9954a4e68700030e0c1718a82f3433074037':
Fixed typo and space.
8058f621891b41c6864b6004c1c47647436a0ac1 09-Nov-2012 Robert Greenwalt <rgreenwalt@google.com> Support for dns domain.

bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
ifiStateMachine.java
7d9cf119d1ab4c1692e27b2a6385f8d27748aa87 16-Nov-2012 Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com> Fixed typo and space.

Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
ifiStateMachine.java
2p/WifiP2pService.java
321020b7e08215b813f15caaad1c59ac215831c6 09-Nov-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove DhcpInfoInternal"
4717c261b2c670d5c0925e3527a864aa52db6ac0 31-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Remove DhcpInfoInternal

First step in accepting a set of patches.
bug:6799630

Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
ifiConfigStore.java
ifiInfo.java
ifiManager.java
ifiStateMachine.java
2p/WifiP2pService.java
5c8e5585e254f9d24320ece18e850140b29236ac 08-Nov-2012 Irfan Sheriff <isheriff@google.com> am 1f6cf5fa: Merge "Re-use existing thread" into jb-mr1.1-dev

* commit '1f6cf5fade6021c1ce788541ec4a60ee36d20651':
Re-use existing thread
cd3d75f35db669f9671d251a36b51cef8a7ca009 07-Nov-2012 Irfan Sheriff <isheriff@google.com> Re-use existing thread

Bug: 7377541
Change-Id: I097f2288ebfc2b4a9782cbced19d9c36d0703acb
ifiManager.java
f264e8e34e32bfb8e7e75b61b9da9b6f219690b0 07-Nov-2012 Irfan Sheriff <isheriff@google.com> am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev

* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
Stop supplicant and dhcp before start
511d5346ced4b37e4ba68e0bd089d4dad8b3bff7 04-Nov-2012 Irfan Sheriff <isheriff@google.com> Stop supplicant and dhcp before start

Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
ifiNative.java
ifiStateMachine.java
b20dae4a8d63f28bbb6ae8c55f191cc52dd7dc47 29-Oct-2012 Irfan Sheriff <isheriff@google.com> am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

* commit '4bfa1e99e2ce5aa96465872a159377102a5bb4cb':
Fix handling escaped chars in ssid
11de9e5537914bbe140fd99ad55333e48a14a667 29-Oct-2012 Irfan Sheriff <isheriff@google.com> Fix handling escaped chars in ssid

Bug: 7427185
Change-Id: Ie669dff01af0865ea50305f3b48cf3f7af92cf6f
ifiSsid.java
88d254cffbf8d1b75d506384a41148a3112b6af1 25-Oct-2012 Irfan Sheriff <isheriff@google.com> am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev

* commit '4e7f2ffe1791807636ac542f73016773c30daa92':
Handle group tear down only at group removed event
2bc0c5fef25fe6d64b976133a3434233f3515d78 24-Oct-2012 Irfan Sheriff <isheriff@google.com> Handle group tear down only at group removed event

Handling group removal at disconnect causes issues where supplicant keeps
the group and then the next invocation fails

Bug: 7403755
Change-Id: Iea7e5ec98486607f8e2c4a55be3743e0545a9da7
2p/WifiP2pService.java
9998f77a75ec9d56b2bc4510f7b4ff1952f4f900 23-Oct-2012 Irfan Sheriff <isheriff@google.com> am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev

* commit 'c48ca657f801b120e88c94287cdeecddc1a46e88':
Fix driver stop handling
c48ca657f801b120e88c94287cdeecddc1a46e88 23-Oct-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix driver stop handling" into jb-mr1-dev
e6464af00033370730e530e4d5402cd049768014 23-Oct-2012 Irfan Sheriff <isheriff@google.com> Fix driver stop handling

Defer supplicant state change event so we do not miss it

Bug: 7394390
Change-Id: Ibae6cef6be42a6cb45dc20ba4fa5060d8e459217
ifiStateMachine.java
5e7fcf372e3559e4f2cacdf892f268b0e5ee1d6c 23-Oct-2012 Irfan Sheriff <isheriff@google.com> am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev

* commit 'bf310d1f6ef4ac167f66a4e31724c7766981bd84':
Fix issues shown on CTS tests
51aec5ed5f78bfc5dea134fa88ef07fcdd572ba2 23-Oct-2012 Irfan Sheriff <isheriff@google.com> Fix issues shown on CTS tests

Reset timeout for single interface architecture

Fix persistence reinvocation handling on the receive side

Bug: 7379336
Change-Id: Iacca0bd6dcbeb42af63bf2078e8cf3126e4e74a7
2p/WifiP2pService.java
cacc47920795ad0421f056004c03984a8e114b8b 19-Oct-2012 Irfan Sheriff <isheriff@google.com> am 61e42262: Fix group join CTS test

* commit '61e42262000549b78843f0959043fec8367ed189':
Fix group join CTS test
61e42262000549b78843f0959043fec8367ed189 19-Oct-2012 Irfan Sheriff <isheriff@google.com> Fix group join CTS test

Bug: 7379336
Change-Id: I20ead7e8c0d855be523bdfd8d9cb9eaa4b8fcac1
2p/WifiP2pService.java
75c61d83bffcbbf9b0518cb034e078b640e2095f 19-Oct-2012 Justin Koh <justinkoh@google.com> Merge "Add appliance mode handling for WiFi Direct invitation dialog." into jb-mr1-aah-dev
8f38f3c8d5283962c99dc63f8efc5fc2bb024641 17-Oct-2012 Justin Koh <justinkoh@google.com> Add appliance mode handling for WiFi Direct invitation dialog.

Add appliance mode handling for WiFi Direct invitation dialog. Otherwise, no
way to accept connections.

Change-Id: Ic31b5bb25fed02848cf7c9e6418e21e9ab8b0cdd
2p/WifiP2pService.java
62fa6de135269a7da135bb89b1eb047a4f11d343 18-Oct-2012 Irfan Sheriff <isheriff@google.com> Do a clean shutdown of p2p

We were doing a lazy shutdown and stopping supplicant behind p2p's back.
Make sure we stop p2p, before we go ahead with shutting down.

Bug: 7368832
Change-Id: I941e9cd69d6f27532207d3dc00b03c55c0e6335c
ifiStateMachine.java
2p/WifiP2pService.java
90a80bb8aece5b1f589020d512a9e1695e2fd1d8 17-Oct-2012 Irfan Sheriff <isheriff@google.com> Merge "Handle null BSSID" into jb-mr1-dev
d4a149d9d06f3a1914babf70c93131f7211eaa2b 17-Oct-2012 Irfan Sheriff <isheriff@google.com> Merge "Frequency conflict handling" into jb-mr1-dev
9f452d0b5ccad77fb6acfd1b20d5f77c9f425d22 15-Oct-2012 Irfan Sheriff <isheriff@google.com> Frequency conflict handling

We now show a dialog to user and let him handle whether to choose wifi
or p2p when there is a frequency conflict.

If user chooses to disable wifi tempoarily, we disconnect wifi until
p2p connection is established and removed.

Bug: 6590401
Change-Id: I73871ddcb3732ae61997d8771b6aa90ad56270af
ifiMonitor.java
ifiStateMachine.java
2p/WifiP2pService.java
edba852930bd2e9ab41f74f340595dafe500c756 17-Oct-2012 Irfan Sheriff <isheriff@google.com> Handle null BSSID

The root cause of why bssid needs investigation, but for now,
we can avoid crashing wifiwatchdog.

When bssid is null, just treat it as a good link.

Bug: 7357232
Change-Id: I080dfc990f3412646976cdc6ef75112ab093d326
ifiWatchdogStateMachine.java
939caef712f306a1c80ea27e9f41ef6e3ea9e0f1 16-Oct-2012 Irfan Sheriff <isheriff@google.com> Fix NPE

Bug: 7357742
Change-Id: I4d12d137b9d5ebf5c6739cbd4405de3f90a3d846
ifiManager.java
d86a532c5271dfbfe7378ddeb6700fafd92ecbcc 15-Oct-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix handling of lost device" into jb-mr1-dev
41de2404658c7c6faf6c78e777ba50af11784f5c 13-Oct-2012 Irfan Sheriff <isheriff@google.com> Fix handling of lost device

We did not update a lost device notice to apps properly. This causes incorrect
connection initiation without a discovery which leads to failed invitation
requests to supplicant.

Bug: 7328758
Change-Id: If4b594c737d639d0f553188309319fba4e3ee7b7
2p/WifiP2pDeviceList.java
2p/WifiP2pService.java
fa3b6258bedf6a66b676020f0ff531d4c9c579eb 11-Oct-2012 Irfan Sheriff <isheriff@google.com> Cleanup on async disconnect and finalize

Bug: 7326726
Change-Id: I6cca47a70cc0f29c68f922618cdcc181fb919a05
ifiManager.java
17cf1f2bbc3f7d4f367dbbee935d2939957c0ef6 10-Oct-2012 Irfan Sheriff <isheriff@google.com> Fix build

had local changes from b/7318044

Change-Id: Idc6907d648a07d36f93dee859e361e9655cdd8e6
ifiWatchdogStateMachine.java
bbe461b78f9697775281d986bcf3c00904e1e62c 10-Oct-2012 Irfan Sheriff <isheriff@google.com> Disable poor network avoidance by default

Bug: 7318044
Change-Id: Icf27e823453eeaba901aad6f3f8eedea242794f9
ifiWatchdogStateMachine.java
462ff630e441f5bc36c4b926ce81bdb35fe7d04b 09-Oct-2012 Irfan Sheriff <isheriff@google.com> Fix handling of hidden access points

We now get raw hex data from the supplicant and we convert it into
printable format.

For hidden access point, we always used to return a single empty string.
We need to make sure we maintain that behavior for apps to not start
displaying empty strings.

Bug: 7310749
Change-Id: I2599b9b5e15be91fc34e9af629ad893b1a0357fc
ifiSsid.java
0befeb29bcdf05b913a332edb4f222e11b4817ac 04-Oct-2012 Irfan Sheriff <isheriff@google.com> Clear interface address and reset connections

With the broadcom architecture, the p2p interface on a group
was dynamic that would just go away. Clearing addresses
was thus not important before.

It is good to clear up the addresses and reset connections
when the group is removed.

Bug: 7282358
Change-Id: Ia1a94fce90f86b54abcc2d1f78a33524ef8045fa
2p/WifiP2pService.java
17d9f6753aa7a00af425fec2305ece5f8b367794 01-Oct-2012 Irfan Sheriff <isheriff@google.com> Make rssi state change sticky

NetworkController misses the rssi state at boot. It gets the wifi
connection status because it is sticky. The rssi state will remain
out of sync until the wifi state machine sends another update which may
not happen if rssi does not change significantly.

Make rssi sticky as well to make sure NetworkController has the last known
signal strength on wifi.

Bug: 6916156
Change-Id: Id7dd621c6dbc35d7354757c61aa18a3b1ba90593
ifiStateMachine.java
ce6fc8d7a49d1b246e37c4e87fd5e715e408bca2 29-Sep-2012 Irfan Sheriff <isheriff@google.com> Revert setting GO idle time out

GO idle time out causes issues with multi-channel capable client which
can take longer to connect.

Use the supplicant default detection when acting as a GO.

Bug: 7254008
Change-Id: I6c40081cfa83ca0ddbb764640a48c92d69e609fd
2p/WifiP2pService.java
ca1269fcb8265c36660b3b47e5c06180e94e6485 28-Sep-2012 Irfan Sheriff <isheriff@google.com> Fail fast on persistent failure

Other fixes

- 20s idle time out was added a work around for an earlier cavium issue. Reduce to 10s
- Reload network fix when supplicant issues an error for a persistent network

Bug: 7248890
Change-Id: I6cea7c88c75aaca40ddcb973404e93ec0f66cbc4
2p/WifiP2pService.java
bdfce2ec05a3e9ca6acd6711de6133e06f2446e6 27-Sep-2012 Jeff Sharkey <jsharkey@android.com> First step towards cleaning up Global settings.

Remove all @Deprecated @hide settings, and clean up any stragglers.

Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
ifiStateMachine.java
ifiWatchdogStateMachine.java
2p/WifiP2pService.java
ca68f4a32f7712876cad59ceff768c37c334214c 26-Sep-2012 Dave Burke <daveburke@google.com> Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev
0f08b813bb0f14f00cf167eeb49b5eea8f3b4f0f 26-Sep-2012 Irfan Sheriff <isheriff@google.com> Remove WifiStateTracker code tracking wifi p2p

This code was never supposed to have been there. It just remained
from an old implementation and actually results in
CS getting the wrong network info when both wifi and p2p are connected

Exposing p2p network type to CS needs to be done differently.

Bug: 7233984
Change-Id: I84a6091b8236cf5bdfcef3e7f626163d629e372d
ifiStateTracker.java
b32e221699201cb647beae3fe0a1771fd5a41cf4 26-Sep-2012 Jeff Brown <jeffbrown@google.com> Merge changes I332f020f,I632648ac into jb-mr1-dev

* changes:
Update references to migrated global settings.
Handle user switched for settings changes.
e79275a9f6d5215fd9b833f8921939c0993389f2 26-Sep-2012 Irfan Sheriff <isheriff@google.com> Merge "P2p fixes" into jb-mr1-dev
bf6f6f9de72c9fd15e6bda9f228c05a9b37d6324 26-Sep-2012 Jeff Brown <jeffbrown@google.com> Update references to migrated global settings.

Fixed one setting that was migrated but not marked deprecated.

Removed a hidden setting that is no longer used by the new
power manager service.

Bug: 7231172
Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7
ifiStateMachine.java
c41096e1b4bf453c195c8c46c5d296f2125d31f6 24-Sep-2012 Irfan Sheriff <isheriff@google.com> P2p fixes

- Add wfdInfo details in group to allow display stack to filter
- Handle provision discovery failure and reset
- Do a discovery after group removal
- Handle failure to reinvoke and fall back to negotiation
- Avoid multiple REMOVE_GROUP calls that lead to removal
of persisted network

Bug: 7210856
Change-Id: Ia2e613e9b1191b919a185f0411439341e2e151bc
ifiMonitor.java
2p/WifiP2pDevice.java
2p/WifiP2pService.java
59358536d2f14b27cdc7386daeabc2b6dca8e177 25-Sep-2012 Irfan Sheriff <isheriff@google.com> Update doc on getConfiguredNetworks

BUg: 7223590
Change-Id: Id92699ae48ea75f94638fcc3bd776b863911985b
ifiManager.java
d36adc31ce0335635b536174299e15b9f099c9ad 24-Sep-2012 Irfan Sheriff <isheriff@google.com> P2p fixes

- NPE fixes
- Remove group on CTRL-EVENT-DISCONNECTED since the supplicant sometimes misses
the group removed event
- Fix the pattern match since we sometimes end up creating group without passphrase

Bug: 7119140
Bug: 7210558
Change-Id: I2cf0be073aaaaa9b931ea9a79b0bf4bd6a2b32ff
2p/WifiP2pGroup.java
2p/WifiP2pService.java
99766cf40ed706aad36032f2107fb0c1e54fc398 21-Sep-2012 Irfan Sheriff <isheriff@google.com> Use min group owner intent for concurrency

Our device only supports STA & GC concurrency

Change-Id: I4f16c959a6f4e7ad5610dcae67be830d741f162c
2p/WifiP2pConfig.java
7d0882be6d7e2a434072cb0bb63cb117e73491cb 19-Sep-2012 Irfan Sheriff <isheriff@google.com> Merge "send connection broadcast on client disconnect" into jb-mr1-dev
5ef9c59fffce221fcfd3f2fcea8f45a41341fa42 18-Sep-2012 Irfan Sheriff <isheriff@google.com> send connection broadcast on client disconnect

Bug: 7188646
Change-Id: I69f2c2581004b08730407930fb056cc1fe54feec
2p/WifiP2pService.java
24ed2769130a8f9df44e7fc22be52b6282e724c3 18-Sep-2012 Irfan Sheriff <isheriff@google.com> Merge "WFD fixes" into jb-mr1-dev
e0c28d5f1358fc2d4c464f910bd04fed4b283fef 18-Sep-2012 Irfan Sheriff <isheriff@google.com> WFD fixes

- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast

Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
2p/WifiP2pConfig.java
2p/WifiP2pService.java
3809f500c3411af2ab5ab6c706cdb4373940123e 18-Sep-2012 Irfan Sheriff <isheriff@google.com> Disable notification scans when p2p is connected

Also reduce scan interval for STA scans to one minute.

Bug: 7138968
Change-Id: I03620f6d462e4ec90d9bb25bbfe709f63173df21
ifiStateMachine.java
2p/WifiP2pService.java
9da603c2da67207869d7fde18817165fa95d3592 17-Sep-2012 Irfan Sheriff <isheriff@google.com> Change order of ps and suspendmode calls

Change-Id: I7872dbea7dc30c57960af95e86eb8e4c7f8e92dc
ifiStateMachine.java
1c045ec2b79c33eb29a24bff11567831ea90398b 16-Sep-2012 Irfan Sheriff <isheriff@google.com> Fix suspend settings at boot

Bug: 7175460
Change-Id: Ibf5e063603866289b3dbae278bc384b833e4a75e
ifiStateMachine.java
2892dfbeafec5315d05fb6ceabeaee73b88f5ff0 15-Sep-2012 Christopher Tate <ctate@google.com> Merge "Fix default population of wifi settings" into jb-mr1-dev
6f5a9a96523ecf97a9828a410dd1226df47ec4e6 15-Sep-2012 Christopher Tate <ctate@google.com> Fix default population of wifi settings

Various wifi settings that are explicitly defaulted did not get their
default code properly converted to refer to the correct settings
database table.

A collection of moved-to-Global settings that had not yet been
marked @deprecated in the Secure.* namespace are now so marked.

Also updated the namespace used to refer to wifi settings from the
Wifi Service. These changes are cosmetic, but they do eliminate a
number of runtime log messages.

Bug 7153671

Change-Id: I9e5b6464d025cfb480ef97373996e38e82f90593
ifiStateMachine.java
424968261fb346859a7ac796703527f2e34c0a84 15-Sep-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix suspend bugs" into jb-mr1-dev
633fe60b78665979109d4796ba22430b7b1cd758 14-Sep-2012 Irfan Sheriff <isheriff@google.com> Fix suspend bugs

Listen to screen broadcast all the time to avoid situations of losing
this information when wifi is turned on and off

Avoid duplicate suspend commands to driver

Bug: 7156907
Change-Id: I162b7ba249ae8925119a534229045965c0c13d1f
ifiNative.java
ifiStateMachine.java
a149edf4385aa8eeca6fa49402487f03d38c2bdd 15-Sep-2012 Irfan Sheriff <isheriff@google.com> Increase GO idle time out to 5 seconds

This is needed to work well with cavium dongle and 2 seconds
was too aggressive to let a client scan and connect.

Change-Id: Id3f1e3711333365c1e90827fb92675fd5dbc49da
2p/WifiP2pService.java
ec7d1380d30088bdc5bf40def653749524f2b6c6 11-Sep-2012 Irfan Sheriff <isheriff@google.com> Disable suspend optimizations during DHCP

We were not handling disabling suspend optimization during DHCP. This can
cause problems with certain routers when screen is off (and suspend optimizations
enabled).

Bug: 7106423
Change-Id: Ib762fff2edec28d7c6990263d4b641566e971213
ifiStateMachine.java
b6deeed3ceff9e0f754697987b7c724901996082 05-Sep-2012 Irfan Sheriff <isheriff@google.com> Handle ascii encoded SSID

Supplicant now passes as an ascii encoded string that allows it to
pass any sequence of bytes for a SSID. see src/utils/common.c in supplicant
for details of the implementation.

We create a SSID structure WifiSsid in framework to store the ssid and handle
the conversion appropriately when required for printing and for an application.

At this point, we still do not handle non-printable octets from an application perspective
for connectivity

Bug: 7110903
Change-Id: I520e5ee23baed4867b8b408bbb3eda5c9e92b6bf
canResult.java
tateChangeResult.java
ifiConfigStore.java
ifiConfiguration.java
ifiInfo.java
ifiMonitor.java
ifiSsid.java
ifiStateMachine.java
e298d884580006cbcd4aec8fd7877dae3f081eec 10-Sep-2012 Irfan Sheriff <isheriff@google.com> Fix device list update

Change-Id: I6a57d90f3750590db4ac5d538956b989d9589501
2p/WifiP2pDevice.java
2p/WifiP2pDeviceList.java
ab603ace22c9f0fe256616697ebfa4ef2928985b 10-Sep-2012 Irfan Sheriff <isheriff@google.com> Merge "Update WifiP2pWfdDevInfo from device found event" into jb-mr1-dev
1f6d8706918ddb277cad5fc8a006cc56ea7dbf69 10-Sep-2012 Irfan Sheriff <isheriff@google.com> Update WifiP2pWfdDevInfo from device found event

Change-Id: I197e84e16147d3db7362e3d6d169ff917c112de2
2p/WifiP2pDevice.java
2p/WifiP2pWfdInfo.java
d8544a51482c86b12da3ac82ea77b83045f689b7 09-Sep-2012 Jeff Brown <jeffbrown@google.com> Copy all mutable state before sending to clients.

This resolves an issue with ConcurrentModificationException
or inconsistent data being perceived by clients.

Fixed an NPE in the WifiP2pDeviceList copy constructor.

Bug: 7133752
Change-Id: I37a4d004f7b1ca21d490f131039d81695db2ba42
2p/WifiP2pDeviceList.java
2p/WifiP2pGroupList.java
2p/WifiP2pService.java
0a66763744db9c9215567ed70051add7f55d53c7 06-Sep-2012 Irfan Sheriff <isheriff@google.com> Add connection broadcast on group creation failure

Change-Id: I8075a53997d968e6926e5ca78c9aadc60d8fcb2a
2p/WifiP2pService.java
ab4cd45133ccea6a66fb081f9b2a8d14eb3e4f1d 16-Aug-2012 Andreas Huber <andih@google.com> P2p API for WFD

Change-Id: I3914a515313654f7032d8bb102afebf0ed776783
ifiNative.java
2p/WifiP2pDevice.java
2p/WifiP2pInfo.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
2p/WifiP2pWfdInfo.java
5ac72a29593ab9a20337a2225df52bdf4754be02 30-Aug-2012 Dianne Hackborn <hackbod@google.com> Improve multi-user broadcasts.

You can now use ALL and CURRENT when sending broadcasts, to specify
where the broadcast goes.

Sticky broadcasts are now correctly separated per user, and registered
receivers are filtered based on the requested target user.

New Context APIs for more kinds of sending broadcasts as users.

Updating a bunch of system code that sends broadcasts to explicitly
specify which user the broadcast goes to.

Made a single version of the code for interpreting the requested
target user ID that all entries to activity manager (start activity,
send broadcast, start service) use.

Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
upplicantStateTracker.java
ifiConfigStore.java
ifiStateMachine.java
2p/WifiP2pService.java
6bfc88876ab575913299b477528225a4d7bf8232 30-Aug-2012 Irfan Sheriff <isheriff@google.com> Fix DHCP handling at disconnect/reconnect

Wifi can have a quick disconnection followed by a reconnection. We used to
create a new DHCP state machine thread for every new connection and
never really waited until it quit after disconnect. This may have lead to
situations where repeated disconnect/reconnects resulted in multiple dhcp
start calls.

We now keep the statemachine after a disconnect and only shut it at supplicant
stop.

Bug: 6417686
Change-Id: Icf66efdc654be886e3eb46c81f09f8cce536f2f6
ifiStateMachine.java
4bbb13976e54f6325cb013882891c02adea61ec5 29-Aug-2012 Irfan Sheriff <isheriff@google.com> Fix join scenario with provision discovery

Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
2p/WifiP2pService.java
da6da0907b28d4704aabbdb1bbeb4300954670d1 16-Aug-2012 Irfan Sheriff <isheriff@google.com> Captive portal handling

We now notify the user of a captive portal before switching to the network as default.
This allows background applications to continue to work until the user confirms he
wants to sign in to the captive portal.

Also, moved out captive portal handling out of wifi as a seperate component.

Change-Id: I7c7507481967e33a1afad0b4961688bd192f0d31
WifiManager.aidl
ifiManager.java
ifiStateMachine.java
ifiStateTracker.java
ifiWatchdogStateMachine.java
bf3218f64de1692ca26c67b1911af856d81e186c 28-Aug-2012 Irfan Sheriff <isheriff@android.com> am 129d6fac: am 67ea8c86: Merge "Added a persistent feature in WiFi Direct."

* commit '129d6fac00545d6ea4eee75f25ddb3ffe8452bb9':
Added a persistent feature in WiFi Direct.
129d6fac00545d6ea4eee75f25ddb3ffe8452bb9 28-Aug-2012 Irfan Sheriff <isheriff@android.com> am 67ea8c86: Merge "Added a persistent feature in WiFi Direct."

* commit '67ea8c86419ffbf603052e816d6b1e9e7e20fbb9':
Added a persistent feature in WiFi Direct.
67ea8c86419ffbf603052e816d6b1e9e7e20fbb9 28-Aug-2012 Irfan Sheriff <isheriff@android.com> Merge "Added a persistent feature in WiFi Direct."
63dc027be28762232335797a30449995c555ae10 27-Aug-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix permission issue on channel" into jb-mr1-dev
0879d03f0a5caa108a0a7320442d57629f9ced81 16-Aug-2012 Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com> Added a persistent feature in WiFi Direct.

Provide a new feature to use persistent group at default.
In the normal connect sequence, if the persistent profile has been
stored, try to use it. Otherwise, a new persistent group is created.
If the persistent profiles are stored over 32, an old profile is
deleted automatically.

Change-Id: Iccb9fa044f1907f0818cd259275e1675f4c3e222
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
ifiMonitor.java
ifiNative.java
2p/WifiP2pConfig.java
2p/WifiP2pDevice.java
2p/WifiP2pGroup.java
2p/WifiP2pGroupList.aidl
2p/WifiP2pGroupList.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
07bde72ff9209de9c037d9bba36bdf0cba299aab 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 9455f8f2 to jb-mr1-dev

Change-Id: I6c6970adb58ac45473c7cc665d99f8e8a6ca8571
35bbe27d58ccf01ffd170b0f617a568bc843a49e 24-Aug-2012 Irfan Sheriff <isheriff@google.com> Fix permission issue on channel

Change-Id: I57f5d128dc2e2aa3bff93e82456f73cb96851f82
ifiManager.java
9455f8f2667bd86a7e51b19112f759406274e76b 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 729f810d: am 8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection"

* commit '729f810d3bca086cf651aa4e2299594a57d6d543':
WifiStateMachine: ignore auth-fail event during WPS connection
5770b2dcf6f28f1ea44146d5eb8c8a6b9cfc3fce 22-Aug-2012 Arik Nemtsov <arik@wizery.com> WifiStateMachine: ignore auth-fail event during WPS connection

Disregard auth failure events during WPS connection. The EAP sequence is
retried several times, and there might be failures (especially for wps pin).
We will get a WPS_XXX event at the end of the sequence anyway.

Without this change, the SupplicantStateTracker class will disable
the WPS network we are connecting to after 2 failed authentication events.
Then, even if WPS succeeds, we will never connect to the selected network.

Change-Id: I57c8e508bfd738405b7f2c2c2325df7838e1b4af
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
ifiStateMachine.java
46b29d8dd558c734f058b3806a0b56a2a23b33fd 22-Aug-2012 Irfan Sheriff <isheriff@android.com> am e5773274: Merge "WifiWatchdog: handle exception from ArpPeer"

* commit 'e5773274d68cf91cb9966f47c54ce69a7a6b03f4':
WifiWatchdog: handle exception from ArpPeer
e5773274d68cf91cb9966f47c54ce69a7a6b03f4 22-Aug-2012 Irfan Sheriff <isheriff@android.com> Merge "WifiWatchdog: handle exception from ArpPeer"
06d371f87be2588de6dddeefb919911c24e58e09 21-Aug-2012 Irfan Sheriff <isheriff@google.com> Fix NPE

Bug: 7026244
Change-Id: I21f13bdbd2d33f0cc082f85474229d9909eb47c1
ifiStateMachine.java
8756bd1d6b43e1724996897cf4593d5ea5b00213 20-Aug-2012 Iliyan Malchev <malchev@google.com> Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev
06c43d575c88976f8709ff3fc0bad7117bde23e7 20-Aug-2012 Iliyan Malchev <malchev@google.com> Revert "Revert "Add timestamp in scan results""

With b/6979211 fixed, we can reinstate timestamps.

This reverts commit 578531082b8e8c8aa03868e69591b7613b0e8b8e

Change-Id: I5dffc8d9701004f7c6325f21e1e33d1cdd2d05c0
canResult.java
ifiNative.java
ifiStateMachine.java
f6307820c88e694e102824225b9d8caa6de75a30 14-Aug-2012 Yuhao Zheng <yuhaozheng@google.com> CTS test for WiFi watchdog - framework support.

The new WiFi watchdog requires kernel/driver to export some packet loss
counters. This CTS tests whether those counters are correctly exported.

Change-Id: I41999676f8488e86f35f1f8214ce668f1a2b5638
ssiPacketCountInfo.java
ifiManager.java
ifiStateMachine.java
ifiWatchdogStateMachine.java
578531082b8e8c8aa03868e69591b7613b0e8b8e 14-Aug-2012 Iliyan Malchev <malchev@google.com> Revert "Add timestamp in scan results"

Temporarily reverting this until all devices switch to using wpa_supplicant_8.

This reverts commit b31f78f93768fef269617ec788a5c6655a375f80.

Change-Id: I33fcb8415288d95289dcd46fa71e950e0f2b87ec
Signed-off-by: Iliyan Malchev <malchev@google.com>
canResult.java
ifiNative.java
ifiStateMachine.java
ee8655c6739cdfb35f192b05d8d4d84402e0d956 14-Aug-2012 Wink Saville <wink@google.com> am 2605aeeb: am b17a583a: Merge "Fix interface name for tethering"

* commit '2605aeeb30e39c2616bbe6ff088d1ed0020b4a3b':
Fix interface name for tethering
2605aeeb30e39c2616bbe6ff088d1ed0020b4a3b 14-Aug-2012 Wink Saville <wink@google.com> am b17a583a: Merge "Fix interface name for tethering"

* commit 'b17a583a3acc57db845993599e4de56e91d5e75a':
Fix interface name for tethering
a6b6556082d371da030f2b32699380d1e0f00c28 27-Mar-2012 Vishal Mahaveer <vishalm@ti.com> Fix interface name for tethering

Fix the interface name used in stopTethering

Change-Id: I3a8fb80c3c6cd382e7641d1735bff85d8a938ee9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
ifiStateMachine.java
b31f78f93768fef269617ec788a5c6655a375f80 11-Aug-2012 Irfan Sheriff <isheriff@google.com> Add timestamp in scan results

Propogate 802.11 tsf details per scan result to the applications
and open up hidden access points

BUg: 2961159
Change-Id: I05658fd0cf010c0b36193db3f79422640e8b3a6b
canResult.java
ifiNative.java
ifiStateMachine.java
3fb4ba616edb114b3197936eb67f481eb86b7cae 10-Aug-2012 Irfan Sheriff <isheriff@google.com> Add control to disable suspend optimizations

Add an advanced setting that allows user to turn off power savings at screen off.

Bug: 5885175
Change-Id: I2dd013b86d7500a2ad1f9ec75d86551808f05543
ifiStateMachine.java
d5857291cb442a392f173ae4fca2668855b7ff69 08-Aug-2012 Andrii Beregovenko <a.beregovenko@ti.com> WifiWatchdog: handle exception from ArpPeer

Sometimes IllegalArgumantException can happen in constructor of ArpPeer
class when IPv6 address is provided. This causes crash of systemserver.

Fixing it by adding appropriate exception handler

Change-Id: I4bb7bbca790745a1bf56ece96dd91b84b1f70cad
Signed-off-by: Andrii Beregovenko <a.beregovenko@ti.com>
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
ifiWatchdogStateMachine.java
b33227d23eb0ec3507192f94c2eee651a0f97783 20-Jul-2012 Yuhao Zheng <yuhaozheng@google.com> WifiWatchdog changes for poor link detection

- use packet loss (wlutil pktcnt) instead of frame loss, retune all parameters
- use wpa_supplicant to get packet loss counters, instead of netd
- handle BSSID roaming in all situations
- improve flapping avoidance mechanism by setting different target RSSI
- handle high packet loss in high RSSI (never seen in real testing)
- add more comments on how to set all parameters

Signed-off-by yuhaozheng@google.com

Change-Id: I33429f063d8625a458be4791edd83a86d5a723df
ifiNative.java
ifiStateMachine.java
ifiWatchdogStateMachine.java
440f32bbd48272095a5482abc87b8769ebd515b6 26-Jul-2012 Jeff Smith <whydoubt@yahoo.com> am ddd88726: am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214

* commit 'ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4':
Fix several cases of broken droiddoc syntax external issue 35214
ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4 26-Jul-2012 Jeff Smith <whydoubt@yahoo.com> am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214

* commit '71930dd77e4dc6f6be5c648019d2ab0da5f0584c':
Fix several cases of broken droiddoc syntax external issue 35214
71930dd77e4dc6f6be5c648019d2ab0da5f0584c 25-Jul-2012 Jeff Smith <whydoubt@yahoo.com> am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214

* commit 'a45746efadd11bb7dfab026fb3c81a25fae74ca4':
Fix several cases of broken droiddoc syntax external issue 35214
a45746efadd11bb7dfab026fb3c81a25fae74ca4 19-Jul-2012 Jeff Smith <whydoubt@yahoo.com> Fix several cases of broken droiddoc syntax
external issue 35214

patch contributed by Jeff Smith <whydoubt@yahoo.com>

Change-Id: I70dcee88a140699bf3e1ab369bed6dcd2fdd3d83
ifiStateMachine.java
88759bbd31e05a4163e1f8e72804ca83000afd53 03-Jul-2012 Irfan Sheriff <isheriff@google.com> Update WifiManager API

Use feedback based on NSD to update WifiManager API

Change-Id: I0c1dc74f7e2fa7cd697a995b7194e3e0366d7981
ifiManager.java
dfd42a9bbc143a46411bf74ad5fddb7da1b3b6e6 03-Jul-2012 Irfan Sheriff <isheriff@google.com> Ignore auth failures during WPS

During WPS, EAP failure occurs many times due to searching
external registrar. EAP failure can also occur after WPS-success.
WPS failures are handled through seperate events, ignore auth failures.

Change-Id: I6a051398d306250510536d157bf812b5a434c84b
Signed-off-by: Irfan Sheriff <isheriff@google.com>
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
ifiStateMachine.java
095c58b73ac112cc7e00771430765434893d8bc5 29-May-2012 Wink Saville <wink@google.com> Enhance StateMachine Quitting and logging support. DO NOT MERGE

Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.

bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7

Conflicts:

services/java/com/android/server/NsdService.java
ifiStateMachine.java
2p/WifiP2pService.java
55b9821dffe5991e554841bf871155a2c4024c56 22-Jun-2012 Irfan Sheriff <isheriff@google.com> Move ARP test functionality to ArpPeer

Change-Id: Iecd6037cf8e0faa626ba6c27cef014822a6bc61b
ifiWatchdogStateMachine.java
90542758d4fef2e5ff8badaf3b40c2a227fbfc47 20-Jun-2012 Irfan Sheriff <isheriff@google.com> Cleanup softap interface to netd

Change-Id: I01e6c5b5a5a8ddaf05b979f9cc6d1293c86e8773
ifiStateMachine.java
b81bb9b40881659428f30b4539dd8877f9ea85f9 08-Jun-2012 Irfan Sheriff <isheriff@google.com> Clear interface addresses upon disconnect

Change-Id: I8ce289cfc72babe894ce9f4d0119a2f2ac5f0859
Signed-off-by: Irfan Sheriff <isheriff@google.com>
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2p/WifiP2pService.java
df3bec04de71eeac8cc2abc178cdda46b1cb151a 08-Jun-2012 Irfan Sheriff <isheriff@google.com> am efcc0ca7: am 4206ee2b: Merge "Fix clear services API" into jb-dev

* commit 'efcc0ca7545190f49bcbc25182d83b21aa01b2aa':
Fix clear services API
96aa0db9a997bc214471aa0d114a452aea6daa6d 08-Jun-2012 Irfan Sheriff <isheriff@google.com> Fix clear services API

BUg: 6631291
Change-Id: I9cee827b5eb78e356fdf86390103136f5610dd3e
2p/WifiP2pService.java
4d7d5268ba42191a997fcc42a513b14854344fda 07-Jun-2012 Irfan Sheriff <isheriff@google.com> am 2654105b: am ca96a322: Merge "Update group capability before connect" into jb-dev

* commit '2654105b15d8da5ad4fd84eef7e2c3f662373283':
Update group capability before connect
57e42f4117e92c03d39f1e1e572f53ef5bb821b8 06-Jun-2012 Irfan Sheriff <isheriff@google.com> Update group capability before connect

We need to get the latest group capability information before connect
now that the supplicant behavior is to do a delayed cleanup.

Bug: 6613470
Change-Id: Ie374d750950f3bd4376fd6a767bb253fd7986eb1
ifiNative.java
2p/WifiP2pDeviceList.java
2p/WifiP2pService.java
b1ebee8ac7c96b48fb47e03a239d41edc376021b 02-Jun-2012 Irfan Sheriff <isheriff@google.com> am 7742b91c: am 1b3dcd3b: Merge "Fix NPE while creating autonomous GO" into jb-dev

* commit '7742b91c7e05c85801a03c36fb2f799703e82b9b':
Fix NPE while creating autonomous GO
ba5065eaf3bd633aa30e0eb00b8a76b7bf33d36d 01-Jun-2012 Irfan Sheriff <isheriff@google.com> Fix NPE while creating autonomous GO

When autonomous GO is being created and we get a device lost event,
fix NPE

Bug: 6595978
Change-Id: Id93b693b8bcc447aea03c04be7556b1f2ff00a90
2p/WifiP2pService.java
39150720c0dc572251ac12fcc0ff36d3d8cb1abb 31-May-2012 Irfan Sheriff <isheriff@google.com> am 39b79e79: am ce9b5c76: Merge "Fix walled garden detection on nakasi" into jb-dev

* commit '39b79e79d3ad9e98a9c76c1b104599be494213f6':
Fix walled garden detection on nakasi
ce9b5c7611954fba91f4983bd41c0507b9931046 31-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix walled garden detection on nakasi" into jb-dev
ae094b27159864cb47015b96d18c5d32ef84fdc1 31-May-2012 Irfan Sheriff <isheriff@google.com> Fix walled garden detection on nakasi

Bug: 6576101
Change-Id: Iad2ea67e54662cd30a0e7425dab2a6174d13d152
ifiWatchdogStateMachine.java
4b5d3a26394dc5f2aca787fd8acfd6e7e9c27460 29-May-2012 Wink Saville <wink@google.com> Merge "Enhance StateMachine Quitting and logging support."
bbf30dfd767f823f5f40d14b498e2a593454c5c9 29-May-2012 Wink Saville <wink@google.com> Enhance StateMachine Quitting and logging support.

Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.


bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7
ifiStateMachine.java
2p/WifiP2pService.java
e2417b7a6ef2ba539be70574fe7c9e1af4810dd4 26-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Retain device during connecting state" into jb-dev
9cb980422ac53b81d6ad15242b0de35b5f3ce13c 25-May-2012 Irfan Sheriff <isheriff@google.com> Retain device during connecting state

With join taking much longer, sometimes device can be lost from supplicant.
Retain device to complete connection.

Also, clear up stale peer data after find stops during inactive state.

Bug: 6557725
Change-Id: I15b92e50a837481f974034b1ea7b32c8abee969e
2p/WifiP2pService.java
da87c7c1eea9a054fd6842995df115113228191d 25-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix delayed wifi shutdown" into jb-dev
f48fb85a8c4f72ec08b98f15ec3d9c70c247de7d 24-May-2012 Vishal Mahaveer <vishalm@ti.com> Fix delayed wifi shutdown

Use a wake up alarm to ensure delayed shut down message is sent

Bug: 5926285
Change-Id: I26a3353ddabb17d55299d8b5f9faf4c7ef5b2448
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
ifiStateMachine.java
4dd5a25a32dc4a721a411f92f0720672ee08020b 22-May-2012 Irfan Sheriff <isheriff@google.com> Add WPS details for certification

We need to provide device details to the supplicant for WPS 2.0 certification

Bug: 6450363
Change-Id: I3eb8bc75faacf392a43b6ef3085971bd32a675ac
ifiNative.java
ifiStateMachine.java
f74f1ac81d442aed4a97475019b40afafcf3017a 15-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Add work around to restart driver on failure" into jb-dev
f91d4e7bdd6923b6f724b7956c0a87714e61fd13 14-May-2012 Irfan Sheriff <isheriff@google.com> Add work around to restart driver on failure

A driver start can fail and device can stay stuck in that state.
Add a work around to retry once after a period of time and then
reload wifi if that does not work.

Bug: 6005966
Change-Id: I930554ac96ac25da2a38e49630d375656e32f6f6
ifiStateMachine.java
c559e3b7f4be5d4ddde23443449f364b359432fe 12-May-2012 Kenny Root <kroot@google.com> Merge "Add in constant for WPA supplication settings" into jb-dev
ba1db8a5912c989e493269b8751c7e9d312e0eae 11-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix wifi direct issues" into jb-dev
10ca870d3b58ec6fd62b85466ec1211fca77d33e 11-May-2012 Irfan Sheriff <isheriff@google.com> Fix wifi direct issues

- BSS command is unreliable, use group owner information from p2p_find
- Fix the autonomousgroup settings
- Use group idle settings only on the p2p group interface to avoid group idle
resulting group formation failures

Bug: 6426991
Change-Id: I44fc204775580fb4fec6ce27070ddbde0751b495
ifiNative.java
2p/WifiP2pDeviceList.java
2p/WifiP2pService.java
343331fa025efb8327ae9b2ebaa276a6d098c102 11-May-2012 Kenny Root <kroot@google.com> Add in constant for WPA supplication settings

This constant indicates what should be sent when a wpa_supplicant's
engine field should be marked as "disable."

Bug: 6480500
Change-Id: Ic963eff4b2ae1496f06e23f80514bf530767c568
ifiConfiguration.java
9e1b58a1234256aada06521cb445673ca4236a0c 10-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Tone down poor connection avoidance" into jb-dev
0a2a91e8784d00b451caedcd4daf49ccf9f5bcb7 09-May-2012 Irfan Sheriff <isheriff@google.com> Tone down poor connection avoidance

Until we figure out a way to compare a poor mobile network
against and poor wifi network and then weighing in other factors,
tone down wifi avoidance aggressiveness

Bug: 6456541
Change-Id: Idc81e4d83f47c9870abbdb4359ddfeaffdcca838
ifiWatchdogStateMachine.java
527ba07b637cedf206fec0d3b0cf92141700a23c 09-May-2012 Irfan Sheriff <isheriff@google.com> Use Map for DnsSd TXT record

Bug: 6434844
Change-Id: I767077585f501b46026ed34ec3e778d3e53209cc
2p/WifiP2pManager.java
2p/nsd/WifiP2pDnsSdServiceInfo.java
2p/nsd/WifiP2pDnsSdServiceResponse.java
531522c7fe0b4b7bccd34dcaf2179c4a8ced619c 03-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Report open networks without saved networks" into jb-dev
027828bff7928a125c7150fe7cb4dcbcba113912 02-May-2012 Irfan Sheriff <isheriff@google.com> Report open networks without saved networks

The supplicant stops periodic scans when there are no saved networks.
The framework needs to have a periodic scan to handle this scenario.

We do have an infrequent wake up scan (15 mins), but thats way too
slow to report an open network.

Setup a scan by the supplicant interval when there are no saved
networks

Bug: 5420656
Change-Id: Id3708ecc874b42971643cc747bb9e7f2efc7d1dd
ifiStateMachine.java
04e83d39523316ad7fa9fd7b3f392caa847ddc70 03-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix reference counting of wifi locks" into jb-dev
2c02da2bc62c4dfef684ea381be02a4e568b73d0 02-May-2012 Irfan Sheriff <isheriff@google.com> Fix reference counting of wifi locks

Bug: 6105898
Change-Id: I7368de91fa4aa63fd97dda0ee91d810aaaa53d8b
ifiManager.java
d07223f8294bbc32c9dbbee295e5c0739ce09550 02-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev
a3cbe75c93f96acdd3e0c4a5f6de5c50c2d6ea85 02-May-2012 Irfan Sheriff <isheriff@google.com> Fix getConfiguredNetworks when wifi is disabled

Bug: 6380917
Change-Id: I4c6f1a379ef2401cde739aedfc82578c03e7dcf3
ifiStateMachine.java
de1e9fa9fbc4b7f4b08415d805a6e5212e655d95 02-May-2012 Irfan Sheriff <isheriff@google.com> P2p fixes

- Fix group idle settings
- Fix provision discovery event handling. We only care about device address.
- Fix WPS setup at start

Bug: 6427634
Change-Id: I0b1a7d73199e373350001114f4607bc39f2a53ba
Signed-off-by: isheriff@google.com
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
ifiNative.java
2p/WifiP2pProvDiscEvent.java
2p/WifiP2pService.java
8e8798d90a008e9262d14f26c4cf24fe552beab7 01-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix connect & save of invalid networks" into jb-dev
b3e96c527b8ac96e869bafeff5f7fab099e28396 28-Apr-2012 Irfan Sheriff <isheriff@google.com> Fix connect & save of invalid networks

Ensure SSID is not null for a new network being added

Bug: 6411912
Change-Id: I26467810bf10b7325c04677c1d0e5ff1cfb4a09e
ifiConfigStore.java
ifiStateMachine.java
83a708e6ad1f12eb792662aeb635453dd58b0361 28-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Handle null SSID cleanly" into jb-dev
00a10a1494954d124e1b11bc1ba3128e47b8ffbd 28-Apr-2012 Irfan Sheriff <isheriff@google.com> Handle null SSID cleanly

Bug: 6411912
Change-Id: I12f9df403c9633d928d898ae675ce36303dda1a8
ifiInfo.java
d8e0831b508bec52a2ad6de2659ce8a4f73b9154 27-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Recover immediately from driver hang" into jb-dev
a5ab608295db0afaa903151fcc9a2fce30620999 27-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Switch to standard commands for pno & power save" into jb-dev
b678320cfa16424e01494fb0ee97bc98c0988bf1 27-Apr-2012 Irfan Sheriff <isheriff@google.com> Recover immediately from driver hang

A firmware crash can now put the interface down without notifiying the framework.
We detect this and recover immediately.

Bug: 6263857
Change-Id: Ib2dc0412fcdf9ce7b90a7fc0fab778f7af9c0513
ifiStateMachine.java
e2639d782eef1365a98dbd2639be23a6dd06e691 27-Apr-2012 Irfan Sheriff <isheriff@google.com> Switch to standard commands for pno & power save

Remove DRIVER commands and switch to cfg based commands

Bug: 6318223
Change-Id: I5e21c4bb554c2992a52fd3c1741629645b22ae43
ifiNative.java
ifiStateMachine.java
bfb27bbefb013220af699881d486cc04be5ec1f5 14-Feb-2012 Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com> Allow override of p2p dialogs

By default, we show dialogs for connection requests and for
user interaction for pin input from the framework.

For applications, that want to make the experience more seamless
we should allow automatic discovery and connection as long
as one app can control it. We allow this for a foreground
app alone right now.

This will be a hidden API for now.

Bug: 6411069
Change-Id: Id342e933073d30eb58bf5a03a47ca26a64df8ddb
Signed-off-by: isheriff@google.com
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2p/WifiP2pDeviceList.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
d52e0c791f83d16cb5de32b6a9a1d785aa56b454 27-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Add support for changing p2p device name" into jb-dev
2bdefcab74d4ee21ad4bc1e90b30aeb7eac589e0 26-Apr-2012 Irfan Sheriff <isheriff@google.com> Add support for changing p2p device name

Change-Id: Ie13fe2adedd0bac6aa07b3369c4d6a05ef33cd24
Signed-off-by: isheriff@google.com
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2p/WifiP2pManager.java
2p/WifiP2pService.java
ea22ddd6bc855238f5e806bf576c48a672d05e4b 26-Apr-2012 Irfan Sheriff <isheriff@google.com> Fix flag on network state change broadcast

Using FLAG_RECEIVER_REPLACE_PENDING causes broadcasts
to be missed confusing the connectivity service

BUg: 6401167
Change-Id: Id69b2df18b9eb6b3e2195fbf399f36501a8d41df
ifiStateMachine.java
4190a047ca1c5eb19a1f7e5d599ef1d532da71c7 22-Apr-2012 Jeff Sharkey <jsharkey@android.com> Better assertions when bandwidth module disabled.

Also disable some verbose logging in WifiStateTracker.

Bug: 6368329
Change-Id: I9a5219bc1b3fd870468f7de46cdf4f173a437c59
ifiStateTracker.java
9f6e4ba50e7e73704c7fbd3ba65fe73bdf8ad73f 20-Apr-2012 Jeff Sharkey <jsharkey@android.com> Connect metered DHCP hint for Wi-Fi networks.

When DHCP lease includes vendor info indicating that remote Wi-Fi
network is metered, advise NetworkPolicy. Users can still manually
change the metered flag in Settings.

Also remove any policies belonging to removed Wi-Fi networks, and
teach isNetworkMetered() about ethernet networks.

Bug: 6344821, 6369307, 6365872
Change-Id: I108606c6fddf2d02828fcab011f3a1501415f1bc
ifiInfo.java
ifiStateMachine.java
6ec0c6afafd9bad5e4c33578e9355997a280649c 20-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Expose NO_SERVICE_REQUESTS error condition"
232ebad9ed1d81d5eab12e0b41cbe522e9a3c320 20-Apr-2012 Irfan Sheriff <isheriff@google.com> Expose NO_SERVICE_REQUESTS error condition

Change-Id: I45214557579fc82faa93a41d22c0890a218b091e
2p/WifiP2pManager.java
3b8be87f89e2f98345980954994bdde82b7ee9ad 19-Apr-2012 Irfan Sheriff <isheriff@google.com> Fix service discovery bugs

- Application does not have transaction id information. go through
list and remove

- Avoid removing client info while enumerating it

Change-Id: Ie293876756418ed4cd6dc3a903689ee7003bd12d
Signed-off-by: yoshihiko.ikenaga@jp.sony.com
2p/WifiP2pService.java
120505424098538ed9dfb97bf29b1dd143715259 17-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Open p2p pre-association service discovery API"
60c8c1570be28eba4cfb9969f5bbee8cbd66f37e 17-Apr-2012 Irfan Sheriff <isheriff@google.com> Fix SSID parse

Bug: 6350079
Change-Id: I104dafa982bd1f144ea3a4fe19a0a23d6bf8075d
ifiMonitor.java
7bdcb1eed755a6a326d807474d2c1476b82220b9 17-Apr-2012 Irfan Sheriff <isheriff@google.com> Fix ssid fetch

Change-Id: Iee5ee5f53bea7dea219b41735cd169389ca7e719
tateChangeResult.java
ifiMonitor.java
ifiStateMachine.java
60792375761c0b2aed11f7f2ccb60c2e59f9fec1 17-Apr-2012 Irfan Sheriff <isheriff@google.com> Log messages in dump

Remove event logging and add messages in dump

Change-Id: Ic79c68443bac9b7257644ed6941853f44a9b0661
ifiStateMachine.java
8bf825f48fde77cb2feb8720aac17093581bb085 14-Apr-2012 Irfan Sheriff <isheriff@google.com> Open p2p pre-association service discovery API

This allows applications to filter out the devices by the
services supported for the purpose of establishing a
connection.

so, a game app can connect to devices that support the game,
and a media streaming app can filter and connect only to
the available media display devices

Change-Id: Ia792e292d2ca771beeb4ca3b007a047527c19229
2p/WifiP2pManager.java
2p/nsd/WifiP2pBonjourServiceInfo.java
2p/nsd/WifiP2pBonjourServiceRequest.java
2p/nsd/WifiP2pBonjourServiceResponse.java
2p/nsd/WifiP2pDnsSdServiceInfo.java
2p/nsd/WifiP2pDnsSdServiceRequest.java
2p/nsd/WifiP2pDnsSdServiceResponse.java
2p/nsd/WifiP2pServiceInfo.java
2p/nsd/WifiP2pServiceRequest.java
2p/nsd/WifiP2pServiceResponse.java
2p/nsd/WifiP2pUpnpServiceInfo.java
2p/nsd/WifiP2pUpnpServiceRequest.java
d4fecc2567ca54427b9c86900bccbc7103ea8fde 13-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Pre-association service discovery support"
21ba8153325e010224c6bc75a0acdc98b6ca82e8 05-Apr-2012 Irfan Sheriff <isheriff@google.com> Pre-association service discovery support

Add UPnp, Bonjour and vendor specific support for discovering services on
Wi-Fi direct before establishing a connection.

Change-Id: I1c1f3427180abdc80a4e682e713adc7f0326c5ef
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
ifiMonitor.java
ifiNative.java
2p/WifiP2pDeviceList.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
2p/nsd/WifiP2pBonjourServiceInfo.java
2p/nsd/WifiP2pBonjourServiceRequest.java
2p/nsd/WifiP2pBonjourServiceResponse.java
2p/nsd/WifiP2pServiceInfo.aidl
2p/nsd/WifiP2pServiceInfo.java
2p/nsd/WifiP2pServiceRequest.aidl
2p/nsd/WifiP2pServiceRequest.java
2p/nsd/WifiP2pServiceResponse.aidl
2p/nsd/WifiP2pServiceResponse.java
2p/nsd/WifiP2pUpnpServiceInfo.java
2p/nsd/WifiP2pUpnpServiceRequest.java
2p/nsd/WifiP2pUpnpServiceResponse.java
7405b90df43a4e2c544f17895158d07130e5922c 09-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "P2p fixes"
55bfa42b05868a62ea66d291dcc51f0150fadcc2 07-Apr-2012 Irfan Sheriff <isheriff@google.com> P2p fixes

Add powersave on client after connect
Set concurrency priority to STA
Fix connection cancellation

Change-Id: I76fd9d1085c611a8c4068047b64289ef539ab389
ifiNative.java
2p/WifiP2pService.java
227dde2be437e613a9a4836905754076c129da37 04-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix key handling"
b5e00bda40398b8738192abfe9b745464a54865a 02-Apr-2012 Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com> Fix key handling

putListener() returns 0 when the argument is null. And The key value of listener
registered first is always 0. For this reason, if the p2p functions are called continuously
and first call is without listener and the second call is with listener, then the message
against first call wrongly pick up the second call's listener because the key value is
the same. In order to avoid this issue, we don't use 0 as the valid listener key.

Change-Id: I0cc960b2ad37f17cf7f528d839b39aa272b83670
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2p/WifiP2pManager.java
4e62fd3f95ee824e6addf438f9e1155a8e0b8e2a 30-Mar-2012 Kenny Root <kroot@google.com> Wifi: change empty "engine" config to integer

"engine" is specified as an integer in wpa_supplicant, so we have to
make sure we send an integer instead of a NULL when we want to disable
it.

Bug: 6250670
Change-Id: I693ccb49badbd400a5882e9df1bbd4febc847a6e
ifiConfigStore.java
8901de0af68f952ed092ed61ebe652cd907f2ada 29-Mar-2012 Irfan Sheriff <isheriff@google.com> Merge "Add discovery broadcasts for p2p"
c111d1caa8d4cc5d2139b5abd4d2db1f78560eff 29-Mar-2012 Irfan Sheriff <isheriff@google.com> Add discovery broadcasts for p2p

This will allow apps to figure out if discovery is active or not
and based on that initiate a new discovery for fresh connections

Change-Id: I4778f135fdd88773e4f0d50c384f9b6ebf561e6d
ifiMonitor.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
5fa47298af9f8495a162db77d718ba2cb82ee113 29-Mar-2012 Irfan Sheriff <isheriff@google.com> Merge "p2p fixes"
8a34718d844ec7abefa7d0736c7d1a37ff658f61 28-Mar-2012 Irfan Sheriff <isheriff@google.com> Merge "Control suspend optimizations from framework"
4898087be98d9df1b6c86cc1802894e1844c6e3d 28-Mar-2012 Kenny Root <kroot@google.com> Merge changes Ibdf23227,I3681f98c

* changes:
Update Wifi to use new keystore function
Add signing to keystore
61472a8314e6716f231ec1c0aba73e005935829b 23-Mar-2012 Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com> p2p fixes

Fix space handling in device name and ssid (This builds from contribution of
Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>)

Also clean up STA event handling and remove the unused interface address

Change-Id: Ic16a4aadf905c1da5c060faa8a3caa83adc0549f
ifiMonitor.java
ifiNative.java
2p/WifiP2pDevice.java
2p/WifiP2pDeviceList.java
2p/WifiP2pGroup.java
2p/WifiP2pService.java
262f766ac8bd330008e1f0a61c1a37c64108b17c 27-Mar-2012 Irfan Sheriff <isheriff@google.com> Control suspend optimizations from framework

The suspend optimizations handling in the driver is being removed.
The framework will hence forth control when these optimizations occur -
we do this at screen off and hold a short wakelock to ensure this.

We also remove the use of the now defunct setsuspendopt command and
handle the high perf locking with the new suspend mode command.

Change-Id: Ia12e38befb2c4f85cad6612bc8f807805bd0dae1
ifiNative.java
ifiStateMachine.java
1b6989cdc212aec7579489a362f99b791abe7352 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge commit '74803dc'

Change-Id: I35a76a27390c75a47e6387fb0ee853a5a689a56f
etworkUpdateResult.java
ifiConfigStore.java
ifiManager.java
09a12bcfab6600a8cc017f0a5f92259dfc8fc471 04-Feb-2012 Mike Lockwood <lockwood@google.com> WifiStateMachine: Move wifi teardown delay to a framework resource

Bug: 5931171

Change-Id: I96a4e3bf1d044ea4a4d2955775703b6f0ce862ed
Signed-off-by: Mike Lockwood <lockwood@google.com>
ifiStateMachine.java
565f9f216aa87f11d451ae6532d5153001a386bf 21-Mar-2012 Kenny Root <kroot@google.com> Update Wifi to use new keystore function

The old wpa_supplicant.conf format used a special URI prefix
"keystore://" for the private_key value to indicate when to load things
from keystore.

The new format uses an OpenSSL ENGINE to perform operations with the
private key, so we don't need the special URI prefix. This changes
enables that usage and also supports migrating the old style
configuration to the new style.

Change-Id: Ibdf2322743eaa129bd2aa5e874f197b573714b57
ifiConfigStore.java
ifiConfiguration.java
90d57dfac3113247e2d38a2235254fc35d12856a 12-Mar-2012 Irfan Sheriff <isheriff@google.com> Improve network avoidance

Adds a back-off based technique where the amount of time we wait before
avoiding wi-fi is increased.

This will reduce power consumption on devices that are experiencing high
variance on wi-fi

Change-Id: I40da03edfb5373ddb51056818ca0744dc26a5600
ifiWatchdogStateMachine.java
4c8982ad820007512e4e9cbb7f15925228d70761 09-Mar-2012 Irfan Sheriff <isheriff@google.com> Enhancements for avoiding poor connection on wifi

- Avoid flapping
- Increase thresholds and monitor rssi more closely to detect consistently weak signal

Change-Id: I6139a20b7306839b345146a72ce690020a2e00b8
ifiStateMachine.java
ifiWatchdogStateMachine.java
db9e6937f18ceeb5715954c828ac4a51e383d140 03-Mar-2012 Irfan Sheriff <isheriff@google.com> Merge "Enhance WPS"
86a5f5b9afa97a4ed6f5a2466fb9359ea131e2fb 29-Feb-2012 Irfan Sheriff <isheriff@google.com> Enhance WPS

- Add a cancel API
- Add more error reporting on WPS
- Fix network status reporting that showed up with new implementation

Change-Id: I499796c80d16d18df95fb702d029aa7e7283b603
ifiConfigStore.java
ifiManager.java
ifiMonitor.java
ifiNative.java
ifiStateMachine.java
2p/WifiP2pService.java
ab26407124cf861eacfe7bf0f2a1ef25f4b3a7bd 02-Mar-2012 Irfan Sheriff <isheriff@google.com> Fix connect on a network id with zero

Pass invalid network id on arg1 when using a config object

Change-Id: I8ef047c951911324d9bf79b744c3e7122bb73bae
ifiManager.java
d3975a917799b85cacaf382b65c5832813066b51 24-Feb-2012 Irfan Sheriff <isheriff@google.com> Fix WifiManager async API

Fix the current asynchronous API to use callback like the way
was done with p2p API.

In the process, fix the use of WPS

Change-Id: Ib6f8714cf51b3525b655948268804e7eaaf17587
upplicantStateTracker.java
ifiConfigStore.java
ifiManager.java
ifiMonitor.java
ifiStateMachine.java
psInfo.java
psStateMachine.java
07573b32494acbabd21979d8b9584c1ed3f7a6ad 28-Jan-2012 Irfan Sheriff <isheriff@google.com> Improve Wi-Fi hand-off

When Wi-fi connects at L2 layer, the beacons reach and the device
can maintain a connection to the access point, but the application
connectivity can be flaky (due to bigger packet size exchange).

We now use Watchdog to monitor the quality of the last hop on
Wi-Fi using signal strength and ARP connectivity as indicators
to decide if the link is good enough to switch to Wi-Fi as the uplink.

ARP pings are useful for link validation but can still get through
when the application traffic fails to go through and thus not best indicator
real packet loss since they are tiny packets (28 bytes) and have
much low chance of packet corruption than the regular data
packets.

Signal strength and ARP used together ends up working well in tests.
The goal is to switch to Wi-Fi after validating ARP transfer
and RSSI and then switching out of Wi-Fi when we hit a low
signal strength threshold and waiting until the signal strength
improves and validating ARP transfer.

Change-Id: Ica593291ec7772da892f03cf45b649635b730c47
WifiManager.aidl
upplicantState.java
ifiManager.java
ifiStateMachine.java
ifiWatchdogStateMachine.java
79f5a0416fe76d5063b4d9995edd84a49b77995e 13-Feb-2012 Mike Lockwood <lockwood@google.com> WifiStateTracker: add support for overriding DCHP max retry count in an overlay

Bug: 5551068

Signed-off-by: Mike Lockwood <lockwood@google.com>

Conflicts:

packages/SettingsProvider/res/values/defaults.xml

Change-Id: I6a6519316a87bd1af39ea9dc51e0d312011135ef
ifiStateMachine.java
870084d26d72a9a58c665349dde3ce511dd28466 15-Feb-2012 Irfan Sheriff <isheriff@google.com> Merge "Initial support for concurrency"
4aa9bcd231d09eb62ea64799a2dfacf45a452049 14-Feb-2012 Irfan Sheriff <isheriff@google.com> Fix shutdown delay

We were timing out on commands after shutting down supplicant

Bug: 5973030
Change-Id: I442ae6a9ad206406dc5f1c8c27be2456a339bba2
ifiStateMachine.java
0e1ad89ca5487babb39c52abcff9da41e0b84462 28-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 27d2ab8b: am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"

* commit '27d2ab8b27e7e1927e18869e898fa556e5da3d43':
Wi-Fi: Handle disconnect in middle of DHCP operation
21bd79f51c032782e3d6ccd22c7e236200d28a94 27-Jan-2012 Vishal Mahaveer <vishalm@ti.com> Wi-Fi: Handle disconnect in middle of DHCP operation

Restore power mode and BT co-ex settings when disconnect
happens in middle of DHCP operation.

Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
ifiStateMachine.java
7d6d9c005e5cfad787bb62b7fee6be2d75b13ca3 11-Jan-2012 Irfan Sheriff <isheriff@google.com> Initial support for concurrency

Use of multiple socket connections over wlan0 and p2p and
p2p state machine is now controlled entirely from wifi state machine

Add discovery stop to allow STA scans to proceed after p2p is used

Change-Id: I790c9112d3f475f638f06fc3ae9e191f6d90ef35
ifiMonitor.java
ifiNative.java
ifiStateMachine.java
2p/WifiP2pDevice.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
fc7f95abcda6fa35c175f9225358ea75c22952ab 04-Jan-2012 Irfan Sheriff <isheriff@google.com> cleanup for concurrency

Allow multiple instances of WifiMonitor and WifiNative to be
created in preparation for multiple socket connections

Change-Id: I06a227f87f1406dc62f884d56ad639ac623414b6
upplicantStateTracker.java
ifiConfigStore.java
ifiMonitor.java
ifiNative.java
ifiStateMachine.java
psStateMachine.java
2p/WifiP2pService.java
576db76106e43129d3df256524c343d0768b2a39 12-Jan-2012 Irfan Sheriff <isheriff@google.com> Sync up state with supplicant at start

Bug: 5534039
Change-Id: I70b3e03b3039877b3c64167d0d246346f9131fc6
ifiStateMachine.java
44b330dfb0aeecb4e2ac97ff72a5abfb341c74fb 28-Dec-2011 Irfan Sheriff <isheriff@google.com> Add multi-interface support to native calls

Add the initial support for supporting seperate socket
connections on the p2p interface.

This is the initial change making primary interface connections
work alongside native support for p2p socket connection

Change-Id: I7619715ca75b10afd29af852279fe713331f75e0
ifiNative.java
ifiStateMachine.java
1f095869536472c178046bb63c59947508eac4a6 21-Dec-2011 Irfan Sheriff <isheriff@google.com> clean up jni code

- Move all supplicant commands out of jni code in preparation for multi-socket
changes

- Also, clean up some function names to remove the explicit command

Change-Id: Id609ac7df0792fb85b52554d159f22064227c584
ifiConfigStore.java
ifiNative.java
ifiStateMachine.java
2p/WifiP2pService.java
cbc46d145a799121424f677b62a0d438feb4f911 21-Dec-2011 Irfan Sheriff <isheriff@google.com> Merge "p2p fixes"
bfed2d6c618e0bf2c271dad1f4acf6d29ebbea51 09-Dec-2011 Irfan Sheriff <isheriff@google.com> p2p fixes

- Change default GO intent to 7
- Handle P2P invitation scenario
- Fix p2p STA connect notification handling to figure device address. Proper fix
for handling both STA connection and disconnection is after we update supplicant

Change-Id: I9ff82f84ad3913905952d1119b7224dff41c24d9
ifiMonitor.java
ifiNative.java
2p/WifiP2pDevice.java
2p/WifiP2pDeviceList.java
2p/WifiP2pService.java
cdc077c9dd6473b5abfad4edfaf1ff41a436caaf 12-Dec-2011 Irfan Sheriff <isheriff@google.com> Fix configured network status

For a connected network, keep status as CURRENT. For a network,
that is disconnected it should be ENABLED. A disabled network
will have the status as DISABLED

Also, add a unit test to ensure there is only one CURRENT network
that is connected

Change-Id: Iaa4a7124a0c372a8f6df3d846ae8c15d9b29cf13
ifiConfigStore.java
ifiStateMachine.java
e744cfff7ca5406f7bba17a14b89856c1ca83262 11-Dec-2011 Irfan Sheriff <isheriff@google.com> Clean up synchronization

- Add delayed disk write in WifiConfigStore
- Remove synchronization and keep all access to config store
throught the state machine thread

Change-Id: I53768a17895e48da7b99542ac95c6c2fddbcb021
ifiConfigStore.java
ifiStateMachine.java
ecd7798ce45f9c8f1901c9348ad5452e0bc88a95 10-Dec-2011 Irfan Sheriff <isheriff@google.com> am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1

* commit 'a3c7c35873235486787d58fa8310eebd87508bc9':
Handle emergency call back mode correctly
c4ea8dfd46a5eeeedd15664a6499ecde32985509 09-Dec-2011 Irfan Sheriff <isheriff@google.com> Remove explicit network disabling code

We are going to always disable the notification

Bug: 5556629
Change-Id: I981eb55a1bb6f44defd674e3a86d9c6f3805f4fc
ifiInfo.java
ifiStateMachine.java
ifiWatchdogStateMachine.java
1108e8ddad3ddf0dbc660229ca3be6de7f600c3a 09-Dec-2011 Irfan Sheriff <isheriff@google.com> Merge "Change RSSI notification levels to 5 in framework"
ea933cb3fddbf5971dd4c62090edabbed295c3a7 09-Dec-2011 Irfan Sheriff <isheriff@google.com> Change RSSI notification levels to 5 in framework

At some point the system UI switched to using 5 rssi levels
while the framework only broadcasts a change for 4 levels.

Hence RSSI change can be slow to be displayed on the UI, fix this

Bug: 5732700
Change-Id: I21700f96ba7a8dd678fb2ccfff8ef59f9b696666
ifiManager.java
ifiStateMachine.java
4494c906168f1b93eb9d130096036d06cfa1e291 08-Dec-2011 Irfan Sheriff <isheriff@google.com> Handle emergency call back mode correctly

Bug: 5726996
Change-Id: I5815dd402bd73c530b9ba6d545d8956064949aa2
ifiStateMachine.java
a6071c338b0f46a47fe9c4bce87d4684e3c93dc7 07-Dec-2011 Irfan Sheriff <isheriff@google.com> am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1

* commit '8c2122cb3e347c607126c49d76fb165125a02295':
Fix CS wakelock handling
87f0a7b1aa3fcd688358f92389d3eeaf1ae99008 07-Dec-2011 Irfan Sheriff <isheriff@google.com> Fix CS wakelock handling

Change-Id: Ibe1c1ab3e26ff0ae7cab7bfb0bd868bfab246037
ifiStateMachine.java
bb60ee97664667c7774aa3c45b473332a3757d21 07-Dec-2011 Irfan Sheriff <isheriff@google.com> am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1

* commit '7c92e2dccb4e5cb5314455692ac32d2ccff24292':
Disable poor network connection alone
19380daaf46815c80bd89fd9ca3af3c4095952b5 06-Dec-2011 Irfan Sheriff <isheriff@google.com> Disable poor network connection alone

- Keep the walled garden detection in place

Bug: 5719771
Change-Id: I9e5d69b6d56096be904106b1db48c02db4c0fb50
ifiWatchdogStateMachine.java
591f6fa7c7dc9b82ccd6d5b0d758116babbaa058 07-Dec-2011 Irfan Sheriff <isheriff@google.com> am 5e2e7d5f: am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now

* commit '5e2e7d5fb81266640f8284abb25fe8be06693f5b':
Disable wifiwatchdog for now
40cb30c2df2176c03f24cbdc194e3af5a4f64758 06-Dec-2011 Irfan Sheriff <isheriff@google.com> am 7b62313e: Disable wifiwatchdog for now

* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
Disable wifiwatchdog for now
7b62313eab4af8835a64fb3fe1e15e5e534a9479 06-Dec-2011 Irfan Sheriff <isheriff@google.com> Disable wifiwatchdog for now

Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
ifiWatchdogStateMachine.java
6b66e9e4c95b1c866ea63a0122fc199994fd7053 25-Oct-2011 Irfan Sheriff <isheriff@google.com> Switch to notifications for walled garden

Also, switches the URL for browser to the actual URL used for checking
walled garden

Bug: 5398921
Change-Id: Ie4d4b1d47f4151d0f85975b10190bdcf5f2e7a57
ifiWatchdogStateMachine.java
d834aeb0f2fb78addd3d2e43b36939f911cd4bbd 05-Dec-2011 Irfan Sheriff <isheriff@google.com> Merge "p2p enhancements"
530040e0b9458994c02f4392765db168128d48da 01-Dec-2011 Irfan Sheriff <isheriff@google.com> p2p enhancements

- Add device name on SSID for legacy devices to discover a given
group and join

- Do not remove a group for a device lost event which only indicates
discovery is stopped

Change-Id: Id431c29da371986e694ab230d72d32061b209ebe
ifiNative.java
2p/WifiP2pGroup.java
2p/WifiP2pService.java
ddba10622dfd3122cf99c795706754e0d41858c3 30-Nov-2011 Jeff Sharkey <jsharkey@android.com> Clean up InterfaceConfiguration flags.

Offer modifier methods for interface flags instead of mutating
directly, and remove square brackets.

Change-Id: I4cce719dccedfb3f0e8448c111e65b93c0008cbb
ifiStateMachine.java
2p/WifiP2pService.java
a5d24d42ff8b99383a8c3051b9459e5248cf8536 29-Nov-2011 Irfan Sheriff <isheriff@google.com> Merge "Redesign p2p around provision discovery"
618455f7e7255019c8cc08a734ba7c52b67a7dc8 18-Nov-2011 Irfan Sheriff <isheriff@google.com> Redesign p2p around provision discovery

= Provision Discovery:Is an optional discovery technique for figuring out
if a peer supports the specific WPS option. For compatibility reasons,
we will now always use it during connection but at the same time support
devices that request to support connection without it

= State machine and UI redesign around the new interaction

= Specify config methods explicitly for compatibility

Bug: 5599949
Change-Id: Ib79435dda472c43cc0746f56bf79ea896b2e33a4
ifiMonitor.java
ifiNative.java
2p/WifiP2pConfig.java
2p/WifiP2pDevice.java
2p/WifiP2pProvDiscEvent.java
2p/WifiP2pService.java
4b173c0d8c168372c0056849cddc932328a6fdd5 24-Nov-2011 Irfan Sheriff <isheriff@google.com> am 694b266e: am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1

* commit '694b266e0366e5400d577659d1bb8152f0a106e7':
Fix tethering interaction from wifi
c74694d5e12b66b1b234d2c8d02a8f72f0e3cd66 22-Nov-2011 Irfan Sheriff <isheriff@google.com> Fix tethering interaction from wifi

- Use the right interface for untether

- Wait till tethering service confirms that untether() is successful before
shutting down soft Ap. This helps to make sure interface does not go away
before clean up is done.

Bug: 5659166
Change-Id: Iff9d4a67ff40664c2114e766590d6a83b7739738
ifiStateMachine.java
af139db574d68f957740cccff74c0ef13bee84e8 09-Nov-2011 Irfan Sheriff <isheriff@google.com> am 1c9126c6: am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1

* commit '1c9126c64b56b6465fd551680461caed2e1ea20d':
Convert soft ap config store to state machine
9575a1bea1787efe1686bd8562bcc70c72d01721 07-Nov-2011 Irfan Sheriff <isheriff@google.com> Convert soft ap config store to state machine

- Create thread when needed
- asynchronous interaction with wifi state machine

Bug: 5587391
Change-Id: Ie6d01b5a6b398a3fa12c384920a473e242443131
ifiApConfigStore.java
ifiStateMachine.java
a4e1014d3658066516e6615f1dc78aecde6be291 05-Nov-2011 Irfan Sheriff <isheriff@google.com> am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1

* commit '45a04db3f95755829b24043d30d7da7182b4f33b':
Avoid quick shutdown after a driver start
45a04db3f95755829b24043d30d7da7182b4f33b 04-Nov-2011 Irfan Sheriff <isheriff@google.com> Merge "Avoid quick shutdown after a driver start" into ics-mr1
a25b1a272cd55af9d3a0d87d86f2095cf14c878a 04-Nov-2011 Irfan Sheriff <isheriff@google.com> am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1

* commit 'a3d9eba10461158a52acfc2a0324696b25db761f':
Reset IP failure counter on a success
a3d9eba10461158a52acfc2a0324696b25db761f 04-Nov-2011 Irfan Sheriff <isheriff@google.com> Merge "Reset IP failure counter on a success" into ics-mr1
e6daca5f53dbb872d0ba6682d0f98831a99c5d9f 03-Nov-2011 Irfan Sheriff <isheriff@google.com> Avoid quick shutdown after a driver start

Causes problems on our wext driver and potentially on cfg
based driver as well.

NLP can trigger very quick acquire and release within seconds
leading to driver switching between start and stop state.

We now keep driver up for atleast couple of minutes after a start

Bug: 5478196
Change-Id: I1b261578252c5fb9a65446241b51e5686d4d9cc3
ifiStateMachine.java
05c6756b5e3159fea91a1845c9fe7ff8ecf1228e 02-Nov-2011 Irfan Sheriff <isheriff@google.com> am b419abca: am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0

* commit 'b419abcadad79cd908acfe51dc6e8902c16ff728':
Avoid duplicate dialogs leading to NPE
7f00c22b7fa7b38b644585c0a3c6faadc5def94c 02-Nov-2011 Irfan Sheriff <isheriff@google.com> Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
1667a485d7cedcbd2cf0300e9a0dffdfaa93b0a2 02-Nov-2011 Irfan Sheriff <isheriff@google.com> Reset IP failure counter on a success

Bug: 5552673
Change-Id: I56c032577be217895b75bf72ecb2c986d2064ab4
ifiStateMachine.java
bbe77ca6be1f6fe5c13c97ccd8baa68ab0272cf5 01-Nov-2011 Irfan Sheriff <isheriff@google.com> Avoid duplicate dialogs leading to NPE

Bug: 5548268
Change-Id: I383d5dba5ed2d77c1623d03990f1139872a65e2a
2p/WifiP2pService.java
b68d7ab80a721661cdff300cd9b2e65a9769737f 27-Oct-2011 Scott Main <smain@google.com> am 12f9900b: am 737c3dd9: Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0

* commit '12f9900bfb004a09ea6a8ce0df27c661124f46ac':
docs: add package description for wifi.p2p and update the one for wifi
737c3dd9f116ae68bcb9b5ce6855afaf2f59738b 27-Oct-2011 Scott Main <smain@google.com> Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0
03bcbe75baf9135c947bb4827189f878e3542365 25-Oct-2011 Irfan Sheriff <isheriff@google.com> Switch to notifications for walled garden

Also, switches the URL for browser to the actual URL used for checking
walled garden

Bug: 5398921
Change-Id: I7eb6f463c9b2f7e11c1d423711fa8a3d2bd2ff13
ifiWatchdogStateMachine.java
2d57d860c2ddf792f4afd6101c19a6d0cf01547c 20-Oct-2011 Irfan Sheriff <isheriff@google.com> Fix handling in DisconnectingState

Now that we also handle supplicant state change to identify that
a network is disconnected (in case CTRL-EVENT-DISCONNECTED goes missing),
it is dangerous to defer all supplicant state change messages
while in DisconnectingState.

It may happen that the CTRL-EVENT-DISCONNECTED goes missing while in
DisconnectingState resulting in a supplicant state change of 0 (disconnect)
getting deferred.

Eventually after a connection completes, the supplicant state change events
get handled and the state machine goes into DisconnectedState.

Fix by having state machine switch out of DisconnectingState once we
do not immediately see a CTRL-EVENT-DISCONNECTED state.

Bug: 5490789
Change-Id: Ia2263795e53c51da0a2bfeefecfeb6256d6c5267
ifiStateMachine.java
d47d4f7b7713a4a05da7ea55c3e698b939fe81b1 20-Oct-2011 Maarten Hooft <mthooft@google.com> Merge "Add a delay before walled garden test" into ics-mr0
a81ac7c450d9d534c46abc7000cc53779a72c283 20-Oct-2011 Irfan Sheriff <isheriff@google.com> Add a delay before walled garden test

This allows a carrier app to authenticate before we notify the user.
For future, we will provide an API that allows app to disable
the walled garden check.

Bug:5398921
Change-Id: Iff98ddaaa9fa38def4f43b1995f4b2c36f93a919
ifiWatchdogStateMachine.java
63fcb397a2583255ec4a0f5e5d8c4c124c272616 18-Oct-2011 Scott Main <smain@google.com> docs: add package description for wifi.p2p and update the one for wifi

Change-Id: Iaf80f9640a4d56100e22d93954edd8aeb5ea4d2b
2p/package.html
ackage.html
a2a1078576187f1192e339c927478205a8bc937f 17-Oct-2011 Irfan Sheriff <isheriff@google.com> Disconnect without CTRL-EVENT-DISCONNECTED

Handle a supplicant state change indicating disconnection
even if we have missed the CTRL-EVENT-DISCONNECTED notice

Bug: 5437924
Change-Id: I28e314f47f17359926c091b2015cd1fb7422fb22
ifiStateMachine.java
0f43161150903a008a5fd703078cdf446601160a 05-Oct-2011 Irfan Sheriff <isheriff@google.com> Add a time threshold for re-enabling networks

Reconnecting to a bad network can be expensive (network down time wise and for the device as well).

Add a minimum threshold.

Bug: 5234206
Change-Id: I5ef1fe06038db73c29a3e95b6229506555f36c77
ifiStateMachine.java
56379d23971baafa0e6987fe2b18d7a1ffea439d 05-Oct-2011 Irfan Sheriff <isheriff@google.com> Handle unexpected interface up/down events

WEXT on crespo has an issue where the interface up/down events
can happen in an unexpected fashion.

At a driver start, we can go from interface disabled to interface enabled,
back to interface disabled and then eventually into an interface enabled state.

Earlier, we were just expecting a single interface enable event that would trigger
driver specific commands. Now, we just handle these events as individual driver
stop and driver start situations so that we do appropriate things eventually

Bug: 5239853
Change-Id: I6bd5d844edf9fadfdca4e8eb753c2ba738aa6ad5
ifiStateMachine.java
7f8a12c75cf2b376fce58fc22b5ecb1b64acf110 04-Oct-2011 Irfan Sheriff <isheriff@google.com> Reduce/Fix system logging

Bug: 5410239
Change-Id: I2f91dfde0b701e8905a1235696591b3154693c7c
ifiConfigStore.java
ifiStateMachine.java
ifiWatchdogStateMachine.java
7960d9f888e31602e17b8856c77a3826bf8c841e 29-Sep-2011 repo sync <isheriff@google.com> Fix IPv6 on wifi

Bug: 5388757
Change-Id: I3c8c776c26dad1daa9801d0455fde749c0206401
ifiStateMachine.java
cbb62bb81807ff83a0887b90111218d81a3f57df 27-Sep-2011 Irfan Sheriff <isheriff@google.com> Merge "Switch to cfg based signal_poll command"
921df5cbc44c00abe85f04093afe7692e73d490a 27-Sep-2011 Irfan Sheriff <isheriff@google.com> Switch to cfg based signal_poll command

Bug: 5352916
Change-Id: Id2ba7091a5e4cc4c1e14aa2c49e5b943519019bf
ifiNative.java
ifiStateMachine.java
c21994bc26df959d1a7161e38b4402b7255ea321 24-Sep-2011 Irfan Sheriff <isheriff@google.com> Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom
32f04e9009046f72242932bf4e820802148e423a 23-Sep-2011 Irfan Sheriff <isheriff@google.com> Fix watchdog to stop ping after wifi disconnects

- The pings are delayed async messages that were getting handled
after a disconnect as well

- Increase poll time to 200 ms, so we block on a receive for 1ms every 200ms for a
sent packet

Bug: 5361564
Change-Id: I1931a1c4146e78a87407d541d8c3934ff8232604
ifiWatchdogStateMachine.java
cf54e4aafc0f4406567fc236b850e8dc507c7093 20-Sep-2011 Irfan Sheriff <isheriff@google.com> Add supplication shut down recovery

When framework fails to get a notice of supplicant shut down,
timeout and proceed with a forced terminate

Also, avoid killing supplicant immediate upon stop and use the
timeout for recovery

Bug: 5337272
Change-Id: Id8971c673dc3082a5f15a6d5cef907bebe1e0fa0
ifiStateMachine.java
7329361cdce711775542b112663bf71a6e0d5cef 14-Sep-2011 Irfan Sheriff <isheriff@google.com> Add support to change IPv6 privacy extensions

Bug: 3360737
Change-Id: I9136992d05f7abf15bdfd92aad3a3e0c0fe3bee2
ifiStateMachine.java
651cdfcbac6245f570475991588ddc2d30265e8d 07-Sep-2011 Irfan Sheriff <isheriff@google.com> Unhide wifi p2p API

Bug: 5247957
Change-Id: Id93e30c0cb60f361ba13a840de8f843415777336
WifiManager.aidl
ifiConfigStore.java
ifiManager.java
ifiNative.java
ifiStateMachine.java
ps.aidl
ps.java
psInfo.aidl
psInfo.java
psStateMachine.java
2p/WifiP2pConfig.java
2p/WifiP2pDevice.java
2p/WifiP2pDeviceList.java
2p/WifiP2pGroup.java
2p/WifiP2pInfo.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
2367e75beebd44338d67c20270cecedd5ca3cb5c 13-Sep-2011 Robert Greenwalt <rgreenwalt@google.com> am 61db35da: am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE

* commit '61db35da2b4501dde5646f86f21cf5054c41ea26':
Make copies of NetworkInfo to give out.
616f3173e08ec6110cf5766c70f84c9e031fb7d7 12-Sep-2011 Irfan Sheriff <isheriff@google.com> Emergency callback mode handling

For wifi, track ECM and shut down and restart when device
goes in ECM and out

For p2p, simply turn off when in ECM mode

Bug: 5185246
Change-Id: I5f5bf75fac3e27db1d7c412135c796f2b137263d
2p/WifiP2pService.java
858c396e877d04843af6db663218b3992c8fee64 10-Sep-2011 Irfan Sheriff <isheriff@google.com> Merge "Finalize wifi watchdog default settings"
6aecb98a627daa3f66c060ca5177a075e4e9bcca 09-Sep-2011 Robert Greenwalt <rgreenwalt@google.com> Make copies of NetworkInfo to give out.

Otherwise we'll change it out from under those we've given it too.
bug:5233462

Change-Id: Iffc886849edfa6ced3da1133f9d363e11b2733f8
ifiStateTracker.java
295da73f051e1a1280284d94d800c57f163a3986 09-Sep-2011 Irfan Sheriff <isheriff@google.com> Disable p2p when airplane mode is turned on

Bug: 5286610
Change-Id: Ia895dfbf0d1bc39458f4a4d24595c862750eea38
2p/WifiP2pService.java
998196d64d35c1767dbb08f059fe3af171e44e1d 09-Sep-2011 Irfan Sheriff <isheriff@google.com> Finalize wifi watchdog default settings

- Reduce DNS counts from 15 to 5. 15 was for debug.
- Keep success scenario as atleast 1 being successful
- Wait for a second to start checks (for some setups)
- Use one bar as a start for doing periodic DNS checks
- Do a DNS check every hour (instead of half hour)

Bug: 5284337
Change-Id: Ie64d8cac48318a0c4c59f91ad21f8c6712b71338
ifiWatchdogStateMachine.java
a420cc460c05b9f078327862a060b3ba67057582 08-Sep-2011 Irfan Sheriff <isheriff@google.com> Merge "Fix system crash on p2p failure"
511f8e2ff23c480808d831125f3c93d4cbd15f59 08-Sep-2011 Irfan Sheriff <isheriff@google.com> Merge "Use hasSystemFeature() API to check for p2p"
f0ef26af3430b9c6402a34eeb9248f805d570922 08-Sep-2011 Irfan Sheriff <isheriff@google.com> Fix system crash on p2p failure

A previous change missed out a function that accepts an
integer argument as arg1. Instead, it was being passed as
parcelable which causes a fatal exception

Bug: 5271220
Change-Id: I3b78d9ce9ab742aa89ceaae17116fb7245187863
2p/WifiP2pService.java
a8f63a38a0570d2521d5db73f05218d114fa902a 07-Sep-2011 Irfan Sheriff <isheriff@google.com> Use hasSystemFeature() API to check for p2p

Bug: 5267396
Change-Id: I4ff3f77c15322564f63beea793c4585cece596e0
2p/IWifiP2pManager.aidl
2p/WifiP2pManager.java
2p/WifiP2pService.java
6f7d385d964949e507dcc9c88012372f48d0bce7 07-Sep-2011 Irfan Sheriff <isheriff@google.com> Update documentation and cleanup to unhide API

Bug: 5247957
Change-Id: I3ef8ac013eec32eb540178ea5febec3d4c0a3428
ifiNative.java
ps.java
2p/WifiP2pConfig.java
2p/WifiP2pDevice.java
2p/WifiP2pDeviceList.java
2p/WifiP2pGroup.java
2p/WifiP2pInfo.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
489a9d81fd1458940e1ec01ba0cef36843732479 07-Sep-2011 Irfan Sheriff <isheriff@google.com> Rename WpsConfiguration to Wps

For the purpose of exposing the class as a storage for Wps
info with p2p, it is better to just call it Wps

Bug: 5247957
Change-Id: Iaebef958dd8f08fdbeb4b9d7fa5ad5527400710d
WifiManager.aidl
ifiConfigStore.java
ifiManager.java
ifiNative.java
ifiStateMachine.java
ps.aidl
ps.java
psConfiguration.aidl
psConfiguration.java
psStateMachine.java
2p/WifiP2pConfig.java
2p/WifiP2pService.java
dff28d5293c16ac75f6db7a1c3b78fbaad1f2f6a 07-Sep-2011 Irfan Sheriff <isheriff@google.com> Handle state transition for p2p enable reject

Bug: 5265878
Change-Id: Ifd0ecb98876ffe098af06d67226f312d2a3d49c7
2p/WifiP2pService.java
daf57e5ff495684f93d9ac2f5c5fc826a02f5f7a 06-Sep-2011 Irfan Sheriff <isheriff@google.com> Add notification when p2p is enabled

Bug: 5262278
Change-Id: I82890323c4e4e2952b4c9c9bc503856095d90c21
2p/WifiP2pService.java
4be4d31f34a0fd0e23de1cbda311c07412f8d0b8 03-Sep-2011 Irfan Sheriff <isheriff@google.com> Fix p2p API interface to framework

- Update the WifiP2pGroup class
- Add reason code response for all failures
- Fix display of self in peer list
- Retain p2p group when explicitly created by API and fix join behavior

Bug: 5247957
Change-Id: Ibd9b163887db1c8a9dd8213253fda20c436a49e3
ifiNative.java
2p/WifiP2pDeviceList.java
2p/WifiP2pGroup.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
9cc2718abc0152d79e3e8bf23be94ddd3cc9db87 01-Sep-2011 Irfan Sheriff <isheriff@google.com> Prepare for exposing p2p API

First part of documentation and cleanup before we can unhide
the p2p API for review by API council.

Bug: 5247957
Change-Id: Idb52f0b699d23e22aa829f60cfac2c98451d2e22
psConfiguration.java
2p/WifiP2pConfig.java
2p/WifiP2pGroup.java
2p/WifiP2pInfo.java
2p/WifiP2pManager.java
9b2886e24301e5d4e7052ec4a6eaff273d3f516c 31-Aug-2011 Robert Greenwalt <rgreenwalt@google.com> Create new isNetworkSupported API

Useful for checking if on a wifi-only device.
Similar to asking for NetworkInfo for a network type and checking for
null, though here the intent is explicit.

bug:5087537
Change-Id: Ia3ddd09b6b735b8b3ceb7a347891e015fd96b218
ifiWatchdogStateMachine.java
2a62b43e671ef893e606292e82bc9fb9a09a3bf5 31-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Remove persistent behavior"
329b79713c06944c02a431081e75ef5e1862d32f 31-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Reload STA firmware on start"
f9cb1d7082870d9fc5f90290e717065441f611ac 30-Aug-2011 Irfan Sheriff <isheriff@google.com> Remove persistent behavior

Until we figure out a good way to do it from both group owner
and client, remove persistent behavior

Bug: 5241839
Change-Id: I31bda672edaa17e6a500f185b6b879dcfdbd069d
ifiNative.java
e36fcea8cdad6ed654079a34104795b2fbf5d2a2 31-Aug-2011 Irfan Sheriff <isheriff@google.com> Reload STA firmware on start

Bug: 5242253
Change-Id: If8e07bc96b46a0e5022cc9d12191de2e4dbec212
ifiStateMachine.java
f99360bf8f8bd3bd9dfd91fa0e91384eaaeebc89 30-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Initialize p2p settings"
335e40c0f1c3aec550e61fa159130527fda597b6 30-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Use seperate config file for p2p"
ad4d2c99ed3a08a5090c38e9dd906df8fb894614 29-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Remove work around for driver state change"
3ac127ff477fa291f83f0906ce3c0981a9597aca 29-Aug-2011 Irfan Sheriff <isheriff@google.com> Remove work around for driver state change

When we first ported wpa_supplicant 0.8, we had a work around
to fix the supplicant state change behavior from the driver.

Remove the work around since the driver behavior is fixed.

Bug: 5195278
Change-Id: I320f21ab01704931a3def6214b0cc40f214a688e
ifiStateMachine.java
9322687d98ec425da03cc10ab64ea19ad7fe2d69 29-Aug-2011 Irfan Sheriff <isheriff@google.com> Initialize p2p settings

And fix associated changes from the settings.

With p2p_reconnect setting turned on, it means the p2p group can be
started without a group negotiation. Hence, handle p2p group started in
the P2pEnabledState

Also, reinvocation results in supplicant not reporting device address correctly.
Handle that until supplicant fix is fixed.

Bug: 5002384

Change-Id: I335f6e854acd6839f54da9b460b17ad7505b1098
ifiNative.java
2p/WifiP2pService.java
f42c39b3d188ebb3ba9003cffc530717829fe874 26-Aug-2011 Irfan Sheriff <isheriff@google.com> Use seperate config file for p2p

Keep p2p and sta config seperate to avoid conflicts.

Bug: 5002384
Change-Id: I8f8fc5f984f4f91f9ece4012bf536daa5cc00bba
ifiNative.java
2p/WifiP2pService.java
8136de08ff4b5c4cca11220143f5905dca38cc26 26-Aug-2011 Isaac Levy <ilevy@google.com> Fixed WifiWatchdog notification bugs

- Space was truncated on 'disabled' notification
- Disable reason was getting wiped out on subsequent disabled
- disable reason was not propogating to WifiSettings

Change-Id: I2e57ee33d285aad39aabe1b048e7436d364b02f3
ifiConfigStore.java
ifiConfiguration.java
b6dbd69fa958d162f638a92d1420cfc9602648ba 26-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Prevent dup network adding - b/5200491"
8fd4a3d0f72b3175936f1dd9ca174a91d196971f 26-Aug-2011 Isaac Levy <ilevy@google.com> Prevent dup network adding - b/5200491

Change-Id: I8260cf73c4261e8efb696bb8557a39e02754190e
ifiConfigStore.java
859e7de2359420dcc5275bdce588b96dcc9203f0 25-Aug-2011 Irfan Sheriff <isheriff@google.com> Fix connection notification for group owner

Bug: 5002384
Change-Id: I099d6907787a0becf9363c3709efd8d4ec2a97af
2p/WifiP2pService.java
ea5b16ac5751022de73e8f1225407eb01e7f1824 24-Aug-2011 Irfan Sheriff <isheriff@google.com> Update p2p state machine and API

- Simplify the API with minimal needed functionality
- Fix responses for all async messages from the framework
- Fix state machine handling of connection setup and supplicant communication

Change-Id: I2724c83760b2aaa2068f9cd81ca0754753f83220
ifiNative.java
2p/WifiP2pConfig.java
2p/WifiP2pDeviceList.java
2p/WifiP2pInfo.aidl
2p/WifiP2pInfo.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
2p/WifiP2pStatus.aidl
2p/WifiP2pStatus.java
a407aef8985f8a7503438ca33f271edceb2e11dd 24-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Added support for multiple DNS servers."
8e28b7d78232f6cf08739ca0d129cc7f9e650801 19-Aug-2011 Jeff Sharkey <jsharkey@android.com> Proactively disable data when over policy limit.

Add policy controls to NetworkStateTracker which are combined with
other user preference and internal flags to decide if data connection
should be established. Better locking around enabled flags.

When data network would be over limit, proactively disable data on
that network. Enable when policy is snoozed or when cycle resets.

Track and dismiss notifications from now-stale policies.

Bug: 4587023, 5178147
Change-Id: Ibfcc9f73cda7c369209af701b46eddd3d1943f2d
ifiStateTracker.java
79e43f679d6102066ee9eff862912806f53bb0e8 17-Aug-2011 Isaac Levy <ilevy@google.com> Added support for multiple DNS servers.

Also increased delay on repeat checks for WWSM.

Change-Id: Ic11b1f37a910c483f48e04dadb539b39fe50e622
ifiWatchdogStateMachine.java
8c57bcdbc6b360ee27d59b957a53e64c03257c9d 19-Aug-2011 repo sync <isheriff@google.com> Fix device address and interface address usage

After a p2p group is formed, STA connect and disconnects come over
interface address. Figure out device address from interface address
and fix the device comparison

Bug: 5002384
Change-Id: I7d3aa4f0616e000550cd2b057adbac71cfd2adb4
ifiNative.java
2p/WifiP2pDevice.java
2p/WifiP2pService.java
2b8edd0c485f74067605c19983e3e7f44b20ec50 17-Aug-2011 repo sync <isheriff@google.com> Use supplicant control channel interface for p2p

Bug: 5002384
Change-Id: Id2131ef43a01288e84178a5b21d289b97db9d736
ifiNative.java
2p/WifiP2pConfig.java
2p/WifiP2pService.java
4a56c437b6fd02dce06fa8565953964b01d21b5d 16-Aug-2011 repo sync <isheriff@google.com> Merge "P2p enhancements"
aea743aaa43a833fd8ff3dc56205197583152d5f 30-Jul-2011 repo sync <isheriff@google.com> P2p enhancements

- ConnectivityService interaction and support for running dhcp server
and client

- State machine enhancements for connectivity interaction

Change-Id: Iba3beb8c87554ffd67a7b7e852bbb4dd8666a4f5
ifiStateTracker.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
7244c977ecbc1f73e4cfd9d824fc2b68aa886139 06-Aug-2011 Irfan Sheriff <isheriff@google.com> Ensure interface down before wpa_supplicant start

Now that the driver is built into the kernel, a runtime crash
followed by a driver unload and reload does not reset the interface.

Ensure interface is down before bringing up supplicant

Bug: 5032635
Change-Id: Ib8f3d47617e587139a8a91a82146ee3a2f329700
ifiStateMachine.java
5f6ddecdeed5a4a7113f98add9b0ec01802a0c19 10-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Add firmware reload support for P2P"
17262c454febcb04ad450cea01323b9eba41081d 10-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Do not log failed pre shared key"
cb30b22ff507a5a9a5d9c584f8b082f5e96c4d02 30-Jul-2011 Irfan Sheriff <isheriff@google.com> Add firmware reload support for P2P

Refactor firmware reload call to support various modes - AP, STA & P2P

Bug: 5002384
Change-Id: I10d20fe5a7842437cf80861bc8a834990db87db5
ifiStateMachine.java
2p/WifiP2pService.java
a25b42ba9aa810594ec3eb02f5e7f37907c36af6 10-Aug-2011 Irfan Sheriff <isheriff@google.com> Do not log failed pre shared key

Bug: 4320948
Change-Id: I1d10ca0c59e4f7f7157b6539786b32c57a202fc8
ifiConfigStore.java
f70430d6dcd4f85db7b173776857d3a4895df863 10-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "DnsPinger -- log setup problems"
26a8d71413f107603ad68f4fa80cf2bf3da9dab1 10-Aug-2011 Isaac Levy <ilevy@google.com> DnsPinger -- log setup problems

Changed class to send a pings for 1.5 seconds to see if conn problems are
resolving after time. Turning RD flag on for now

Change-Id: I05bcf208bda3ea8fb98bd7aec8f0109523d64583
ifiWatchdogStateMachine.java
50a928f41445141be50428b02bd86a9ffcfd5f8e 10-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Avoid turning off wifi tethering on interface down"
14f3ae7fe0a73aae4e023ed815c51597c1bc5455 09-Aug-2011 Irfan Sheriff <isheriff@google.com> Avoid turning off wifi tethering on interface down

The hostapd daemon can bring down an interface, followed by immediately bringing it up
and this results in us turning off tethering completely.

Wait for the right notification to enter tethered state after brining up hostapd.

Bug: 5135245
Change-Id: I95c8c0c4c2c99c03fce2d18c014eaff37ed4e762
ifiStateMachine.java
8dc6a1b2823f374a176fb21b8a174664a5f825fa 27-Jul-2011 Isaac Levy <ilevy@google.com> Watchdog notify on explicit connect

Notifies when user explicitly clicks on wifi dialog.

Change-Id: I5eee37d68b422d748d41e9384d5006482a223dc5
upplicantStateTracker.java
ifiConfigStore.java
ifiConfiguration.java
ifiInfo.java
ifiManager.java
ifiStateMachine.java
ifiWatchdogStateMachine.java
d6d0628051f259d03367fe4e71af7137f9184142 05-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Rewrote DnsPinger - now is async and concurrant"
d2fe04b71a89a0608eb7c67065dead2a1f540122 22-Jul-2011 Isaac Levy <ilevy@google.com> Rewrote DnsPinger - now is async and concurrant

Change-Id: I93e1374ae857832935202614e34ce18f040fcfc7
ifiWatchdogStateMachine.java
f6d09845be2d58b1de7af9f6edc8b9ee216520a5 04-Aug-2011 Irfan Sheriff <isheriff@google.com> Fix p2p package paths

Split change Iba3beb8c which will not go in master to fix package paths

Bug: 5002384
Change-Id: I15072b65422fcdfe17c3f130d169258d60748012
ifiStateMachine.java
2p/WifiP2pService.java
88bae17cfd3de40758c5296d15f012f06f08748a 28-Jul-2011 Isaac Levy <ilevy@google.com> Changed walled garden to better url

Now checking for walled gardens using 204 error code on
http://clients3.google.com/generate_204

Change-Id: I0a00dc8b956f35f6695d2085c9f03ce40dc7e231
ifiWatchdogStateMachine.java
4ad39d6ac16961df0e7a3e4b4e7075aaa5202787 27-Jul-2011 Isaac Levy <ilevy@google.com> Will not disable wifi on wifi-only devices.

- Turn off watchdog by default on wifi-only devices, b/5073657
- Do not disable wifi networks if connectivity manager reports
no mobile connection.

Change-Id: I835e753624fc5e447081cde473039011721112c6
ifiWatchdogStateMachine.java
7dd04132d370537a07d3ad0e0ee7c8ff75166876 26-Jul-2011 Irfan Sheriff <isheriff@google.com> Run hostapd on a seperate thread

Hostapd start can block and state machine can be slow to respond.
Refactor wifi state machine to handle this behavior.

Bug: 5079498
Change-Id: Id7707bf2b0e1cb46a1f1374598ec4d7f6403ae1a
ifiStateMachine.java
17b8451019543bc226e012bab09cd6da55c91cd2 25-Jul-2011 Irfan Sheriff <isheriff@google.com> Merge "Fix interface notification race"
e8daf2a7000e12dc0d62cb98b06ca849cf40564a 24-Jul-2011 Irfan Sheriff <isheriff@google.com> Fix interface notification race

In one use case, I see that if we go straight from
wifi client mode to tethering operation, the interface change notifications
are reported in an order that causes to enter tethered state
without actually tethering through connectivity service.

It is because an interface down notification (from wifi going down) comes after
we have started soft ap and we think we have tethered after calling startTethering
and switch to Tethered state

Instead, we should make sure tethering has started before going to Tethered state.

Change-Id: Iba7e8fab0feeb5637d40938862a8638871df8b02
ifiStateMachine.java
55bc5f3e0408bcb5a39a6732de0b2d1aa99a55be 24-Jun-2011 repo sync <isheriff@google.com> Updated: Wi-Fi p2p framework

First stage. Get the bones in right now even though
we are not ready on the native side.

Once, we have things underneath working - we will further update the
framework

Change-Id: I4a7dab5cd4267373dc5f8989ae4122f91c384ed5
tateChangeResult.java
upplicantStateTracker.java
ifiMonitor.java
ifiNative.java
ifiStateMachine.java
psConfiguration.java
psStateMachine.java
2p/IWifiP2pManager.aidl
2p/WifiP2pConfig.aidl
2p/WifiP2pConfig.java
2p/WifiP2pDevice.aidl
2p/WifiP2pDevice.java
2p/WifiP2pDeviceList.aidl
2p/WifiP2pDeviceList.java
2p/WifiP2pGroup.aidl
2p/WifiP2pGroup.java
2p/WifiP2pManager.java
2p/WifiP2pService.java
2p/WifiP2pStatus.aidl
2p/WifiP2pStatus.java
23eb297c771bd996fe8559178feb1a07be43ad72 23-Jul-2011 Irfan Sheriff <isheriff@google.com> Handle hostapd and tether interface changes

The set config will only update hostapd config file right now and we need to restart after that happens.

Also, softap interface is changed to be the regular interface

Bug: 5069108
Change-Id: Ibe80129b58e5339f06f186870bcd8f37569c6db3
ifiStateMachine.java
e046975503e7c6ebd78e35afaad88e3fb1ebfb5a 22-Jul-2011 Isaac Levy <ilevy@google.com> Fixing WifiWatchdog log flag

Accidentally merged verbose logging - setting to false.

Change-Id: I6cd9321c7602d86aac4a8340ef0233310a665bd9
ifiWatchdogStateMachine.java
d7a374f6f8f52a88d7e9a4660d9bf9037cf0b659 21-Jul-2011 Irfan Sheriff <isheriff@google.com> Merge "Fix multicast API"
b0c1b80f471bd49af60e7b78161d814e355a6972 20-Jul-2011 Irfan Sheriff <isheriff@google.com> Fix multicast API

Fix multicast API and disable mutlicast V6 packets at driver start

Bug: 5016558
Change-Id: I1e04a905a36045e52c785c1dc702cc246a381a57
ifiNative.java
ifiStateMachine.java
d7b3e6a39b6b2e155b24ef470023bafb3b9fa35a 21-Jul-2011 Isaac Levy <ilevy@google.com> WifiWatchdogSM notification for first wifi disable

Also moved customizable settings into Settings.Secure and
added listeners for setting changes into the state machine.

Change-Id: Ia6859c71f7edae13062685867959adc423af4643
ifiWatchdogStateMachine.java
3550ac919c492f3fbaebbf868f4df0d1ea7ee784 07-Jul-2011 Isaac Levy <ilevy@google.com> Adding WifiInfo object in CONNECTED broadcast

Adding a parsable wifiinfo object in Connected broadcast, public api.
The connected broadcast only occurs on successful setup on the wifi
interface, so in normal use is very infrequent (once if the wifi
sleeps, or once at new hotspots, etc...)

WifiInfo objects are small, <10 ints, <5 short strings, and contain info
that could be useful to listeners, such as SSID.

The alternative is to the poll the Wifi Manager, using getConnectionInfo.
Because the Wifi Manager can update state in its own thread, polling the
Wifi Manager might result in an info object that's out of sync from the
received broadcast.

Change-Id: Iafcec77f45dd094ea84e6022b7a40e8952ae8137
ifiInfo.java
ifiManager.java
ifiStateMachine.java
654f5090754e4e1bf4c1736d0a24769a15a6037e 14-Jul-2011 Isaac Levy <ilevy@google.com> WifiWatchdog rewrite to formal statemachine

Rewrote wifiwatchdog service to use net.statemachine

Change-Id: Id6fd42b13192ac2e99f842ff50e9edff1696675d
ifiWatchdogService.java
ifiWatchdogStateMachine.java
8171e6f690cca1bad354e7e352823d79d420daf3 08-Jul-2011 Wink Saville <wink@google.com> Use resetConnections with resetMask.

Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
ifiStateMachine.java
6d815e9dd00a5cb36554acb7b2f76f47c03cd7cf 07-Jul-2011 Irfan Sheriff <isheriff@google.com> Merge "Moved WifiWatchdogService and DnsPinger"
a7bc1135c270fd4a84ab7ad45b7194e9b580300e 06-Jul-2011 Isaac Levy <ilevy@google.com> Moved WifiWatchdogService and DnsPinger

- Moved WWS and DnsPinger in prep for StateMachine rewrite
intent.

Change-Id: I912ca80d31ee2ded99eb345a2e5a55d01bd9910c
ifiWatchdogService.java
c4501f7710b8da1bc16f0670e4e7343db01f7146 04-Jul-2011 Ji-Hwan Lee <jihwan@google.com> Log supplicant restart count correctly

Currently, it's always 0.

Change-Id: I99b2d31e61e1ec7dfffc7a77e04f4059fd6869ef
ifiStateMachine.java
cf99765b6255d73aa4fbc61d5bd78ec65fbd0370 22-Jun-2011 Irfan Sheriff <isheriff@google.com> resolved conflicts for merge of 914ed90f to honeycomb-LTE

Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
c74eacde3028551864d8a9f8822803a835785c3a 22-Jun-2011 Irfan Sheriff <isheriff@google.com> resolved conflicts for merge of 267a6181 to honeycomb-LTE

Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
914ed90f2c02092474d2db36626734ca1b2cf315 21-Jun-2011 Irfan Sheriff <isheriff@google.com> Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""

This reverts commit 58d1bb497e0d83e28a02fbcdc1f33f29a992db7e.
ifiStateMachine.java
58d1bb497e0d83e28a02fbcdc1f33f29a992db7e 21-Jun-2011 Irfan Sheriff <isheriff@google.com> DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"

This reverts commit fe3b33d4ead06c546202753e38188db5e2eaa7fa.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
ifiStateMachine.java
f2288c960cce22ea3971d79f6aa13ed61c699176 17-Jun-2011 Irfan Sheriff <isheriff@google.com> Merge "Fix IP address cleanup on network disconnect"
f5600618df153d9c51388562ebf3524e3bdc8b7d 16-Jun-2011 Irfan Sheriff <isheriff@google.com> Fix IP address cleanup on network disconnect

We used to bring down the interface on network disconnect
which would in turn clean up all the IP addresses.

The interface bringup/shutdown is now handled by wpa_supplicant.
Add netd interface for clearing all IP addresses

Bug: 4676254
Change-Id: I7e24c0ab2e4a412b8d61e9c33ce028966913aaf6
ifiStateMachine.java
e1f9064e356a07a08222c8c4a588969b4c0a8c99 16-Jun-2011 Irfan Sheriff <isheriff@google.com> Fix network state handling

Change I242cda97 introduced a regression where network state
was being modified on any supplicant state change.

Revert the old behavior of only changeing network detailed state
based on supplicant state change in a disconnected state

Bug: 4690073
Change-Id: I927cc5fa36b862cc54661b033939f543cd15d31f
ifiStateMachine.java
4f1f7d3158b1576b72eabbb05f8ab8cfb25cd403 16-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE

* commit '241b65aca93e263f0869c5bec4ad1dbda0dec6db':
Reset connections AFTER we take down the network.
ec896c6a863b3cc0a55538a19879e2112b5b8658 15-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> Reset connections AFTER we take down the network.

If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.

bug: 3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
ifiStateMachine.java
1523da22e91217e06a01610c202d5e52c2e9dfce 10-Jun-2011 Irfan Sheriff <isheriff@google.com> Fix driver start/stop handling

The driver start and stop events will be removed as they are now
redundant (and incorrect)

Move to using supplicant INTERFACE_DISABLED indication for deciding
if driver has started or stopped

When driver start is given, the supplicant will first switch to
INTERFACE_DISABLED state and then out of it to start connecting.
We should use this indication to find out driver has started

When driver stop is given, the supplicant will just switch to
INTERFACE_DISABLED state and this indicates driver has stopped

Bug: 4550125
Change-Id: I242cda97951a733c8707c8d99cdfcc9a33b75c2d
upplicantState.java
ifiMonitor.java
ifiStateMachine.java
680e0a4782a2b8012343794a36e8e7debcb2305c 10-Jun-2011 Irfan Sheriff <isheriff@google.com> Merge "Remove interface disable in wifistatemachine"
89f2ea6fc24d6010f83caf89b462b7caa75ce022 10-Jun-2011 Irfan Sheriff <isheriff@google.com> Remove interface disable in wifistatemachine

Supplicant now handles interface disable/enable on its own

Change-Id: Ib104989dd49654befff82261cc531b0646c7b15d
ifiStateMachine.java
dd65ed25c47acf5d551f56a232e1656f2f8c3483 09-Jun-2011 Irfan Sheriff <isheriff@google.com> am 92593dc4: am 84db79bb: Merge "Clear IP configuration on lost network" into honeycomb-LTE

* commit '92593dc49b348c4951037a1ae2fa17bb6644ffb9':
Clear IP configuration on lost network
0c13d479398ab4d940a302d2efd37cfeee51f872 07-Jun-2011 Irfan Sheriff <isheriff@google.com> Clear IP configuration on lost network

Bug: 4391449
Change-Id: I574128083a5612f13fcccaf5ed091eae114b7943
ifiConfigStore.java
ifiStateMachine.java
319da8c4c59be36fe2e221a0aba230ef6b77a14f 27-May-2011 Irfan Sheriff <isheriff@google.com> Add new states to support wpa_supplicant 0.8

Latest supplicant introduces the INTERFACE_DISABLED state. This
is entered when the interface is brought down (which is effectively
done by us and tracked already through the driver stop operation)

Also, added is a state for tracking authentication when supplicant acts as
the SME

Change-Id: I76090068d0ebba6df76f16707da559fcbd7512c5
upplicantState.java
upplicantStateTracker.java
ifiInfo.java
d57f5067e6465f18dfb27eaf0454a65d28ce1548 25-May-2011 Irfan Sheriff <isheriff@google.com> am c2ff0e70: am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE

* commit 'c2ff0e7031b54810d26e1d2a1ba9cdb529f25306':
Clear network id when invalid
0a8bd60a8e064c8d310f0abd9503350633b05eca 21-May-2011 Irfan Sheriff <isheriff@google.com> Clear network id when invalid

Bug: 4391449
Change-Id: If0902a3fe4ad65d34dfc3d60f0e630d5e868d6a9
ifiStateMachine.java
e526cfb490a4c855d3b6c89096c9f606b02190f8 20-May-2011 Irfan Sheriff <isheriff@google.com> am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2

* commit '5b9ceebafd36db4491a49c1f00750ce50c4d4433':
Move softap config handling to WifiConfigStore
a4815c0ec06c293ea9f50b2b925d5a98d11f1143 19-May-2011 Irfan Sheriff <isheriff@google.com> am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2

* commit '9c9088a54f6dee7a13dcc7a12297137147b01baa':
Move softap config handling to WifiConfigStore
ffcea7ae7316ab748a49f5e8f6c6798356f35719 11-May-2011 Irfan Sheriff <isheriff@google.com> Move softap config handling to WifiConfigStore

Move softap config to flat file and read/write on a seperate handler thread

Bug: 4391796

Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
WifiManager.aidl
ifiApConfigStore.java
ifiManager.java
ifiStateMachine.java
fe3b33d4ead06c546202753e38188db5e2eaa7fa 07-May-2011 Irfan Sheriff <isheriff@google.com> DO NOT MERGE Add DhcpStateMachine

Add DhcpStateMachine for interation with dhcpcd

- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
simultaneously
- Optionally, a controller can request a notification prior
to DHCP request/renewal being sent

Change-Id: I5324814b19ff19863aa6fa89f1e3f0a202930c98
ifiStateMachine.java
fba19ff5e8135878a1d87ed696e0a89cc776f37e 28-Apr-2011 Irfan Sheriff <isheriff@google.com> DO NOT MERGE Define Protocol class

Adds a common namespace for communication across
different state machines

Change-Id: Ib6a29715c651371f91a950348a8525275b6026a0
ifiStateMachine.java
a8e0dfae06298b375637813a3263a62749dd0b82 02-May-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of db46fa25 to master

Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
d713683f9f5230d6a234ce8efbaf3c0959b81e22 02-May-2011 Irfan Sheriff <isheriff@google.com> am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE

* commit 'd369d64ee7931726d479e60e64d76a31fdba4a8f':
Add DhcpStateMachine for interation with dhcpcd
a47c40193fcbe9ca07facea78b2828afdae5e025 02-May-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
aa70f101e08098ed9cb190abe2d7f952561026b8 28-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Add RouteInfo objects for tracking routes.

Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
ifiConfigStore.java
31be7cf4c7aef140f2a576975a7fd31e062f6964 28-Apr-2011 Irfan Sheriff <isheriff@google.com> Add DhcpStateMachine for interation with dhcpcd

- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
simultaneously
- Optionally, a controller can request a notification prior
to DHCP request/renewal being sent

Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
ifiStateMachine.java
2dbf683b61cd2e6389fed2c028a18928234e315f 28-Apr-2011 Irfan Sheriff <isheriff@google.com> am c1f39396: am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE

* commit 'c1f39396b94837f728c56b4c3e2f5c37e1d0eef7':
Define Protocol class for use with StateMachine
3fc75e9267a585101a06edc13d141b58efb9691f 28-Apr-2011 Irfan Sheriff <isheriff@google.com> Define Protocol class for use with StateMachine

Adds a common namespace for communication across
different state machines

Change-Id: I0a9ae872112567afd35a1dc95ac9283170f3f459
ifiStateMachine.java
5cd8d4decea60fccb52614b15bd0ceaa9fecc384 08-Apr-2011 Irfan Sheriff <isheriff@google.com> handle supplicant stop after child states exit

When a user explicitly disables wifi, wait on the supplicant shut down until after
all child states have handled exit - this avoids time outs due to communicating with
supplicant after breaking the socket connection

Bug: 4052161

Change-Id: Iec5bb3e14a2df4a8a12de8bb81d9c10aeb992ad4
ifiStateMachine.java
343c1ad7200619230a55caa6aa8a9d041e62b29d 19-Apr-2011 Wink Saville <wink@google.com> am 37677849: am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

* commit '37677849998e6c9a39afe0a730b2f0131a371f3b':
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
64c42cae4482fe0157e977b8ddd0f2c2436b3f31 18-Apr-2011 Wink Saville <wink@google.com> Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
upplicantStateTracker.java
ifiStateMachine.java
psStateMachine.java
43a17654cf4bfe7f1ec22bd8b7b32daccdf27c09 07-Apr-2011 Joe Onorato <joeo@google.com> Remove the deprecated things from Config.java. These haven't been working since before 1.0.

Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
ifiMonitor.java
80f7c594fae3f1b19e3ea78938de450418fe183c 07-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp

* commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21':
Add external dependency API.
d55a6b498d66d8fc415908ecf63e50f46cce67e8 25-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> Add external dependency API.

An APN will not be connected to if some external dependency is not met.

bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
ifiStateTracker.java
2b7f63887e39079a52592fb4507d8daaf90e8afa 25-Mar-2011 Irfan Sheriff <isheriff@google.com> Add support for supplicant SCAN_INTERVAL

Also, allow scan interval for framework and supplicant
to be configured at build time or run time

Bug: 4144882
Change-Id: I877f4bcc872597b44d3f4da85cf2bc0f16e09444
ifiNative.java
ifiStateMachine.java
d710fb500c121b3f9563ccfbe488f7c9d3ec4985 16-Mar-2011 Kenny Root <kroot@google.com> Update WakeLock-related docs to mention permissions

android.permission.WAKE_LOCK permission is required to use WakeLock or
WifiLock, but nowhere is it mentioned that you must declare that
permission to use it.

Change-Id: Ib5f5294d37e39169fe5678743f380d95c4e5a842
ifiManager.java
4aeca7c5908387bc7efb0785830aea1053264062 11-Mar-2011 Irfan Sheriff <isheriff@google.com> Backup and restore IP and proxy settings

Bug: 4081954
Change-Id: I27266637c6ade0c5c8242792176d1edae0983446
WifiManager.aidl
ifiConfigStore.java
ifiManager.java
ifiStateMachine.java
84cffa45261519a96949ec5c6cd8e21fea950ff5 03-Mar-2011 Irfan Sheriff <isheriff@google.com> DO NOT MERGE update current config with dhcp settings

After DHCP completes, update the current configured
networks list with the IP setting details

Change-Id: I1ece1eda20224c69a4635bd38fdc5bef15818bb2
ifiConfigStore.java
ifiStateMachine.java
04e04fe333874afdbc4bb5936533c5a6f0855cfd 03-Mar-2011 Irfan Sheriff <isheriff@google.com> Merge "fix network disconnection handling"
9b3710b253db932d560f2f08d62b6eb2d37e3c67 01-Mar-2011 Irfan Sheriff <isheriff@google.com> fix network disconnection handling

We should avoid network id set unless the access point is associating.
Also, we should reset network connection state before sending
out network change broadcast.

Finally, we should reset connect mode settings when we disconnect from
an access point

Bug: 3424635
Change-Id: I41db5399810218abd6a77155166db5a9b1dbd22c
upplicantState.java
ifiStateMachine.java
7e48e76cab10377367b925790cf3a840651009fa 02-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Start using NetworkUtils.numericToInetAddress."
e590373ea71251cfffc8f22f011e2e6335dce716 23-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Start using NetworkUtils.numericToInetAddress.

Generates InetAddresses without risking an accidental dns lookup. For use with supposedly
numeric-only ip address strings.

Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
ifiConfigStore.java
ifiStateMachine.java
2f6409686f4ecced13474db9307fcd33a805b2bf 01-Mar-2011 Irfan Sheriff <isheriff@google.com> Merge "Using AsyncChannel for wifi connectivity"
d86dbb9e00c998979db488a720ce263291f22c6a 01-Mar-2011 Irfan Sheriff <isheriff@google.com> am 5af7cf7c: am f9e2a491: Fix issue to clear scan alarms

* commit '5af7cf7c558e6febfa5d48b62900929743d2f7bb':
Fix issue to clear scan alarms
ebe606fccd9293674273d5f73246e0e8e6e6ddcf 24-Feb-2011 Irfan Sheriff <isheriff@google.com> Using AsyncChannel for wifi connectivity

Change-Id: Ieee5a3a1a739238d8a6659493684f1be0cbea691
WifiManager.aidl
ifiManager.java
ifiStateMachine.java
psStateMachine.java
f9e2a491176b086cd3c238b209e025cd68d76001 28-Feb-2011 Irfan Sheriff <isheriff@google.com> Fix issue to clear scan alarms

If PNO is set after the device is disconnected, the scan
alarm should be cleared to prevent both PNO and alarm
being active at the same time

Bug: 3495698
Change-Id: Id48c87fef68a34a05799e6b82de4088e0573009f
ifiStateMachine.java
74ff3d23f9c0bf0f13a9635473626e9d3cc21103 18-Feb-2011 Irfan Sheriff <isheriff@google.com> DO NOT MERGE Add support for background scanning

Background scanning (preferred network offload) allows us the
host to sleep while the dongle monitors the presence of any
preferred networks. This allows us for significant power savings
since the system does not have to wake up often to initiate
a scan

Bug: 3453021
Change-Id: I73dcf4e1c9ab4de280c40b6df6147a74ac003123
ifiNative.java
ifiStateMachine.java
563db5343f93fec6897304443b501e397292401b 23-Feb-2011 Irfan Sheriff <isheriff@google.com> Merge "Add support for background scanning"
fcc0845cf9990470d498dcaa036f0ae6487ddf34 18-Feb-2011 Irfan Sheriff <isheriff@google.com> Add support for background scanning

Background scanning (preferred network offload) allows us the
host to sleep while the dongle monitors the presence of any
preferred networks. This allows us for significant power savings
since the system does not have to wake up often to initiate
a scan

Bug: 3453021
Change-Id: I7c1dbfd0c3f717df81e4da6091c4c5657c9ec9ca
ifiNative.java
ifiStateMachine.java
e5a3e9790110cb42ff0c4e882eec04e6961ed402 21-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove some unused code."
645b83f3ec2ead154c2062fd6d4498713d11de7e 21-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Remove some unused code.

Change-Id: Id29bf7d2118065e2e772b22d910bda1c6de2a475
ifiStateTracker.java
227bec49157bc496f7c9e8e8f63c12728a448922 16-Feb-2011 Irfan Sheriff <isheriff@google.com> data activity reporting on wifi

Initial checkin, need icons to complete the feature

Bug: 3412258

Change-Id: I9a3ecc8159cc314d84707065dafe23d402409a84
WifiManager.aidl
ifiManager.java
ifiStateMachine.java
7cb0d07fcf03150ecd04cc5c2573923dae72a366 17-Feb-2011 Irfan Sheriff <isheriff@google.com> Merge "Add WPA support for soft Ap"
ec8d23af7372204f068aebaa1bfae87dc9260e23 17-Feb-2011 Irfan Sheriff <isheriff@google.com> Add WPA support for soft Ap

Bug: 2771935

Change-Id: Ib16c1c3b9aaccbcdf372365d3c0825bdf0680207
ifiConfiguration.java
016d37e6c557a760c6508f5c06c8e65d2492772d 17-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Make WifiInfo not use int for ip address."
124b44d89bc00b150c9478ccddfa83cac0f1df24 17-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Make WifiInfo not use int for ip address.

Change-Id: Ib27824cd0722099e157024ee2a9797236157bc8e
ifiInfo.java
ifiNative.java
ifiStateMachine.java
652bc96444b0a82d34e6c3766b7862effac11adb 16-Feb-2011 Irfan Sheriff <isheriff@google.com> Make high performance wifi lock public

gtalk and sip already use the high perf lock. Improve
the comments and make the constant public.

This will allow applications that use voice or video
to keep the connection good even when device screen
is off

Change-Id: I3608cd478175c773bd835b26a686a61b8baf5471
ifiManager.java
19f8ca846b5234278d3001782077b90aad61a85c 15-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Remove some unused wifi dhcp code.

Change-Id: I114b3772b334a41936c6ed4bb8304f6914481ef1
ifiNative.java
614613e2d2fe51d484bfbeed6eeb8b66b151df37 11-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Update LinkProperties treatment of gateways"
992564e481af13cbcb058ee801f9254a520c54a1 09-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Update LinkProperties treatment of gateways

A link can have multiple gateways (think ipv4/ipv6 for a trivial example).
.

bug:3438810
Change-Id: I28c90a6947cd50b82e5ca9a0113148f98b3f4dd8
ifiConfigStore.java
34ee52e60c7bd220d755f30ee7924cc04e0b3ca2 10-Feb-2011 Jesse Wilson <jessewilson@google.com> Adopt LruCache in WifiStateMachine.

Change-Id: I2d2f07e8b9895ae2fd05299033336fbca047373f
http://b/3184897
ifiStateMachine.java
ed1264093234b1f1354cd5f669eb82a50bb56869 29-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Bind addr and prefixLength together in LinkAddress

bug:2542681
Change-Id: I90200446216d78c676498144946832afe75efdb8
ifiStateMachine.java
0216e618198393bfd7ac0625fa6ad251d5ea682f 15-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Make the interface with DHCP IPv6 capable.

It doesn't work (yet) for IPv6, but we can remove v4-centric notions from the framework.

bug:2542681
Change-Id: I21c058f5c88d07706c9265bf0ea902fc90357e56
ifiConfigStore.java
ifiStateMachine.java
a9a4f5cc88a373ffcea8902f178fe0a6572c0aa8 21-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Switch from NetworkUtils to netd for iface config."
27d3c5907cc6f4366a7af3f0941d8d29d9b2440b 20-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Switch from NetworkUtils to netd for iface config.

Moving more stuff to netd and getting rid of unused NetworkUtils.

Change-Id: Ibb5a11dca58d07291fe33e6d33027553f6158ea7
ifiStateMachine.java
43e747ef59e67734392d2d189e59fb9d11901037 20-Jan-2011 Irfan Sheriff <isheriff@google.com> Add untether call during softap shutdown

Bug: 3355187
Change-Id: Ie4381648883186a216807bcd0d586ecfd00ca15c
ifiStateMachine.java
d033e9caa1ad56bc6c4cc23c2104fc8370773e08 20-Jan-2011 Irfan Sheriff <isheriff@google.com> Merge "Handle EAP authentication failure" into honeycomb
b98d878f43748a64c68ffe05ce64c5b7c72fe922 20-Jan-2011 Irfan Sheriff <isheriff@google.com> Handle EAP authentication failure

Avoid the scenario of an EAP network indefinitely trying to connect
due to an EAP authentication failure by disabling the network

Bug: 2149114
Change-Id: Iec8da7551c2dff9b153f41a2139529133130399d
upplicantStateTracker.java
ifiMonitor.java
ifiStateMachine.java
0c7e16450c9060551bd0bea6e08bc9fb2ba411b4 19-Jan-2011 Irfan Sheriff <isheriff@google.com> Fix soft Ap handling on system restart

When system server restarts, a soft AP
start can fail. Fix it by doing a stop
and start through netd.

Bug: 3236625
Change-Id: I95f31eb34a03b64cb7e2b6b8bdd56fc2119b605b
ifiStateMachine.java
fcb659b66756ac02bd1491ae1365b27e8509a890 16-Jan-2011 Irfan Sheriff <isheriff@google.com> Report WPS overlap error

Add certification requirement to report an overlapping
WPS session failure to user

Bug: 3354319
Change-Id: I8c51bc20c2ec8e8d92a86ed2dfe2a3ede9c56885
ifiManager.java
ifiMonitor.java
ifiStateMachine.java
e4c56c9655bf936454e2f3ee434aacb403876c7d 13-Jan-2011 Irfan Sheriff <isheriff@google.com> Fix WPS to provides immediate feedback

If WPS is already active, we drop user's request
and convey an in progress message

If WPS fails to start, a failure indication is conveyed
to the user

Bug: 3316078
Change-Id: I238c55973cb29cf5c1be66197ffcb4978316cb89
WifiManager.aidl
ifiConfigStore.java
ifiManager.java
ifiStateMachine.java
psResult.aidl
psResult.java
psStateMachine.java
6bb7652b47b7c3068fa5e20a20263e651180c856 11-Jan-2011 Irfan Sheriff <isheriff@google.com> Fix network availability reporting

Report wifi is available as long as it is kept on

Change-Id: I5be9461106ef4968cbc423f90e0ff168e089791f
upplicantStateTracker.java
ifiStateMachine.java
65eaec88f3670384ac6c63e8c21ca13c21d2a407 06-Jan-2011 Irfan Sheriff <isheriff@google.com> Use BluetoothAdapter broadcast for coex settings

Use the bluetooth adapter broadcast so that we capture
various bluetooth profiles for both scan coex settings
and coex settings during DHCP

Change-Id: Idec41940514efe7ea9927f67b6199b4893794e2a
ifiStateMachine.java
8e86b89860114386e6c43f55fc034a26798b73e2 22-Dec-2010 Irfan Sheriff <isheriff@google.com> Enable networks on screen on

We now all configured networks on screen on.
Also, removed event logging for scanning and rssi polling

Bug: 2129037
Change-Id: I995893d77f8575a8d987d9d8604c8272f636d12d
upplicantStateTracker.java
ifiConfigStore.java
ifiStateMachine.java
b45e726bf5df9650e8a67a7c05bf2f41f414c07d 21-Dec-2010 Irfan Sheriff <isheriff@google.com> Fix wifi broadcasts

Add the missing wifi disable broadcast and also send out
supplicant disconnect on shutdown.

Added unit test cases.

Bug: 3294055

Change-Id: Ia56a8ec9d17784c5aac5b8b369c04837f9057c54
upplicantStateTracker.java
ifiStateMachine.java
d3040307abe598367ada0c878686f2b71284ef58 16-Dec-2010 Irfan Sheriff <isheriff@google.com> Merge "Fix ssid storage regression"
58938159ec378670ea784d07aa13ac47f4730cbb 16-Dec-2010 Irfan Sheriff <isheriff@google.com> Fix ssid storage regression

I introduced a bug with change Ic12fd78f. Quite
possibly a copy-paste issue.

Bug: 3281928
Change-Id: I040fa8580c3d6d5c585d0e5cc4306daab2f44c3d
ifiConfigStore.java
5d001ea0271eeedb05984ac00d5e41d767f0cb87 15-Dec-2010 Irfan Sheriff <isheriff@google.com> Use clear names for native API

Change-Id: I96c3089e10c75f433410f66c01204b7e5de2dc55
ifiNative.java
ifiStateMachine.java
3a65de795d5bf8f575a38a2ad83d5e3e234ae4a6 15-Dec-2010 Irfan Sheriff <isheriff@google.com> Initialize network state on start

Bug: 2542613
Change-Id: I5b16b2dc866c7f25bc61f1a04cf5fa9938ec2c3e
ifiStateMachine.java
96071a7031bac06e3f249610b010ad5651efe8ae 14-Dec-2010 Irfan Sheriff <isheriff@google.com> Handle supplicant stop correctly

- Use a clean terminate for a regular stop and on failure kill supplicant. This prevents
WifiMonitor from getting hung permanently on a socket in case of a kill

- When WifiMonitor exits, kill supplicant and cleanup sockets

Change-Id: I87c32e03d945433f33eed8c326d7f0368925bf55
ifiNative.java
ifiStateMachine.java
02fb46a297c4f645f2a30b574151401dd0978521 08-Dec-2010 Irfan Sheriff <isheriff@google.com> WPS fixes and refactor

- Allow IP and proxy set up for WPS
- Use string for WPS pin to avoid losing leading zeros
- Add a seperate WPS state machine and WpsConfiguration class

Change-Id: I87f43fff8bba0ae8ff02e5fc495a8bc628a8c8cf
WifiManager.aidl
upplicantStateTracker.java
ifiConfigStore.java
ifiManager.java
ifiNative.java
ifiStateMachine.java
psConfiguration.aidl
psConfiguration.java
psStateMachine.java
e798268f16ec6d0542616ea45ca0bb18ae2645ee 07-Dec-2010 Wink Saville <wink@google.com> Have MobileDataStateTracker & DataConnectionTracker communicate directly.

Added CMD_SET_DATA_ENABLE which is sent when data is enabled/disabled
via the ConnectivityService. It is anticipated that the communication
channel will be used for additional commands and to receive unsoliciated
commands from DataConnectionTracker back to MobileDataStateTracker.

Change-Id: I3863e7385155d503f069b1dcb7e4f766ec78b5f8
ifiStateTracker.java
cf34f47eddedbeab4ace8150d026e81a5d9485ae 06-Dec-2010 Irfan Sheriff <isheriff@google.com> Update scan results when frequency band is set

Change-Id: I4864b66f96744682a0de274fd49cca035ffc5d3c
ifiStateMachine.java
9beea36441ef805a8a3c343553e281f1966c047e 04-Dec-2010 Irfan Sheriff <isheriff@google.com> Hold network hand-off wakelock only when connected

Change-Id: I31132cb2966cfc1eb205e070116b4c784d292f46
ifiStateMachine.java
be9ee6a498afc08df1ca6d796b703b703b25c9a9 02-Dec-2010 Irfan Sheriff <isheriff@google.com> Fix configuration change handling

When IP or proxy config changes, we now reconfigure
the network and inform connectivityservice.

Also, fixed the naming for changes on configured
networks.

Bug: 3237735
Change-Id: I2a94b3158b6b0e0d27442d7fd525a8a23f0497f8
etworkUpdateResult.java
ifiConfigStore.java
ifiManager.java
ifiStateMachine.java
ifiStateTracker.java
3c661bde458b7c69f494673c7d6728a7a871b586 23-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Fix Wifi's setting of isAvailable.

Manifested itself in ConnectivityService reporting no connectivity.

bug:3220092
Change-Id: I4c0149125b8e2b9c2493f87d208aecbf21590fff
ifiStateMachine.java
44138f15cef6cfc84686f39227cf61062eb7817e 19-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Merge "Notify all VMs when proxy changes."
434203a277cd2f237a71508a3d5a7d1602126cd5 12-Oct-2010 Robert Greenwalt <rgreenwalt@google.com> Notify all VMs when proxy changes.

bug:2700664
Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
ifiConfigStore.java
19d245b792e1d941fbba9b04ae20ce9d6e6e18f8 12-Nov-2010 Irfan Sheriff <isheriff@google.com> Split SupplicantStateTracker and refactor

- Move SupplicantStateTracker into a seperate file. In the
process clean up code that needs to be present only in SupplicantStateTracker

- Retry twice for password failures

- Clean up supplicant state handling. Dont treat supplicant states
as HSM what values. Instead, just retain SUPPLICANT_STATE_CHANGE

- Add event logging in SupplicantStateTracker

- Move scan handling out SupplicantStateTracker

Change-Id: I083e1c40ef5a858164493b1440b82c5751b3bfb5
upplicantStateTracker.java
ifiStateMachine.java
36f7413dabfab50699135019ba55151e9227f59d 05-Nov-2010 Irfan Sheriff <isheriff@google.com> add frequency band control API

Change-Id: I6cc6cdef27d493d4ef76cec17fdca7e49d9dc8d7
WifiManager.aidl
ifiManager.java
ifiStateMachine.java
090813ac95b1bd5f60f67f70bb49b0886954de09 04-Nov-2010 Irfan Sheriff <isheriff@google.com> Initiate wake up scan only in a disconnected state

When wifi is connected to an access point, we should
not wake up the device to initiate scans.

Change-Id: I1a48387a0cac7b23a8d947d8409cafc63da18d38
ifiStateMachine.java
ed4f28b492da3ff140bbaabbbda798a08c40ea5b 30-Oct-2010 Irfan Sheriff <isheriff@google.com> Set country code in the driver and remove channel set

With dual band support, using country code
settings is the way to go

Bug: 2936741
Change-Id: I760dce4c43b1af19ee205c28f0d287420c8d9e85
WifiManager.aidl
ifiManager.java
ifiNative.java
ifiStateMachine.java
1406bcb75150e8386b4d858f27089cc1359e7f14 28-Oct-2010 Irfan Sheriff <isheriff@google.com> Use AsynChannel for synchronous API

also cleaned up some unnecessary synchronous commands from state machine,
and fixed an issue with a synchronous WPS command

Change-Id: I55bf4379d9810e11f2ba2e03e2e703b132d1488f
ifiStateMachine.java
5876a4273e67271f0eca607af9520f7e5abbe4f3 13-Aug-2010 Irfan Sheriff <isheriff@google.com> WifiLock extensions for high performance mode

Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: Id394d265b9876bf0230efb3d222056e9b80b44fd
ifiManager.java
ifiNative.java
ifiStateMachine.java
f235c5ab91b040b88ceb61beb819e15f1b19e9e4 22-Oct-2010 Irfan Sheriff <isheriff@google.com> add wps pin from device capability

Bug: 3119043
Bug: 3112178
Change-Id: Iaae6bcf53e11f7fac82b3c604ddc27ff05e00542
WifiManager.aidl
ifiConfigStore.java
ifiManager.java
ifiNative.java
ifiStateMachine.java
5a1e4cf83f5be1b5d79e2643fa791aa269b6a4bc 19-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Update BT APIs return type from Set to List.

Change-Id: Ia27220dd26cde13007f6938c830517ee7f6968ce
ifiStateMachine.java
4b7ba09c8bf773dbd045b4bbe7831fa16e33653d 21-Oct-2010 Wink Saville <wink@google.com> Change removeNetowrk to a synchronous channel call.

Change-ID: Iad0380d56972826615e044fa2aaee418b617d732
ifiStateMachine.java
4f5f7c968339a83b6af98ac8893a1ac33c7aa7bc 15-Oct-2010 Irfan Sheriff <isheriff@google.com> Fix wake and scan behavior

- Add wakelock for driver start/stop to ensure a wifilock
acquisition kick starts driver. Also cleaned up state machine
driver start/stop behavior.
- Add periodic scans when driver is started to ensure wifi
reconnections when wifilock exists or when user chooses
never to sleep
- some minor clean up

Change-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534
ifiStateMachine.java
138f10e3f140ea84b976607ada7081a498a3610a 20-Oct-2010 Dmitry Shmidt <dimitrysh@google.com> wifi: Allow dual-band support

Change-Id: I90e421efca783080261789378ef6054ac394c1e2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ifiStateMachine.java
cdf8edeec2f5a063e94966449744c7f513578847 11-Oct-2010 Irfan Sheriff <isheriff@google.com> Remove synchronous bluetooth callbacks

Also, fixed an issue with disabling bluetooth coexistence

Change-Id: Ia7f68dfe6e8d587101ba8513783a0123ff0561a1
ifiStateMachine.java
68825ac32deb00991e18b5b40b455b68e9d78324 13-Oct-2010 Irfan Sheriff <isheriff@google.com> state machine fixes

- When supplicant dies, restart it
- When wifimonitor fails to connect in time, restart
supplicant
- fix dhcp counter reset
- defer all load/unload actions when waiting for supplicant
control connection
- we dont need to disconnect & reconnect at start with the
faster monitor connection and handling of failures

Bug: 2973023
Bug: 3090725
Change-Id: I5c834ddd08e6300e2b29da0941a24633825b4d3b
ifiStateMachine.java
c949b9c3ffe5ed9e2112a15224a86c55651fedfd 12-Oct-2010 Irfan Sheriff <isheriff@google.com> Retry quicker for control channel setup

Bug: 2976277
Change-Id: Ifedb0c1aebefc251028e8d2f578f530a3840c702
ifiMonitor.java
96ca91761e6857c1ca2e4fafe5b35e4b5fefe5a1 06-Oct-2010 Irfan Sheriff <isheriff@google.com> Use LinkProperties for IP and proxy configuration

Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270
ifiConfigStore.java
ifiConfiguration.java
ifiStateMachine.java
ed5d7d17c9e9837ce7a6a10698cce9f6e4101acd 02-Oct-2010 Irfan Sheriff <isheriff@google.com> Add LinkAddress

LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
ifiStateMachine.java
128cecab968337038591cc14e3cdd5b37b2e5cb9 23-Sep-2010 Irfan Sheriff <isheriff@google.com> Add proxy settings per wifi network

Provide per network proxy settings configuration
for wifi. This is stored along with the ip configuration
in ipconfig.txt

bug: 3039302
Change-Id: Ic8bc14493583be19fde3d7c463d1e5a77e6df25f
ifiConfigStore.java
ifiConfiguration.java
ifiStateMachine.java
7440fc2e0e0257043b967a80dceb0b33797d1d12 28-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Wifi: Update code for new BT Apis.

Change-Id: I1deb0a9a1533958cdb79179bebd2d3b435b0b07c
ifiStateMachine.java
5ee89800bee7c6c755778795a536e0e2f12b85ff 17-Sep-2010 Irfan Sheriff <isheriff@google.com> Add Wifi Protected Setup support

Add WPS PBC and WPS pin method support with pin obtained
from AP

Bug: 2277571

Change-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610
WifiManager.aidl
ifiConfigStore.java
ifiConfiguration.java
ifiManager.java
ifiNative.java
ifiStateMachine.java
03f3cb083d708d4d3226b80ed42c9d2876a56edc 18-Sep-2010 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 1f377298 to master

Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4
1f377298e2aaf6a1736295c0413d468eb1db5091 18-Sep-2010 Dianne Hackborn <hackbod@google.com> am 58e0eefe: Improve power tracking of WIFI use.

Merge commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp

* commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
Improve power tracking of WIFI use.
58e0eefeb5e2e270e2b04369bbf29fc22abda8d5 16-Sep-2010 Dianne Hackborn <hackbod@google.com> Improve power tracking of WIFI use.

We now distribute "wifi started" time across all apps that are
holding WIFI locks that cause it to be started. But only when
WIFI would not normally be running. Also have a mechanism to
distribute other WIFI work that has happened across those processes
based on their use.

Also fixed a bug where we were not retaining the CPU speed step
stats across boots...!

Change-Id: I00e3153b98429166273750512cc37e7975211ab9
ifiStateTracker.java
f61101f6266be243c481d163b95e65d67b8d1669 17-Sep-2010 Wink Saville <wink@google.com> Add LinkCapabilities

Change-Id: Ia1599ade936b79f12526252c0a2e6b453abb136e
ifiManager.java
ifiStateTracker.java
31b62322bfa9470d648fbfd69510e03da29b29af 30-Aug-2010 Irfan Sheriff <isheriff@google.com> Add per network static IP settings

Remove the existing global static IP settings and add support
for per network configuration

Change-Id: I5a6d8b877471b8c8ad07951c96d273893754607f
ifiConfigStore.java
ifiConfiguration.java
ifiStateMachine.java
e746f03c6c8b8d0897d322ab524d545ace200fcd 14-Sep-2010 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 53686433 to master

Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
53686433a9790bcfe7211a661b26783ee12bb436 13-Sep-2010 Dianne Hackborn <hackbod@google.com> am 7e9f4eb2: Track client requests through location manager.

Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp

* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
Track client requests through location manager.
7e9f4eb2608148436cef36c9969bf8a599b39e72 11-Sep-2010 Dianne Hackborn <hackbod@google.com> Track client requests through location manager.

This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like... say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work. Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
WifiManager.aidl
ifiManager.java
ee923072eb65cbf4f007458450e182a1289c2b7b 03-Sep-2010 Irfan Sheriff <isheriff@google.com> Merge "Add set/get band in WifiNative"
25c9bf2396ceb48fc5cfd5c1dd58aa4d4750d056 02-Sep-2010 Irfan Sheriff <isheriff@google.com> Add set/get band in WifiNative

Add support for set and get band and set the default
to 2GHz for now till we get a fix on issues
with 11A

Change-Id: Icb9bddc353e4bf013bdb8a08d9b4ee3451c282f4
ifiNative.java
ifiStateMachine.java
5de38d11f6bb277ac0930f4264f012dac14a05a9 02-Sep-2010 Wink Saville <wink@google.com> Remove unused Intent filter values.

Change-Id: I902cdbbff9238b2ac975441ef6ecb3c6d5c7a56f
ifiStateTracker.java
04db1d5d3a51f9b710b707cfdc1c2f41ad948237 31-Aug-2010 Irfan Sheriff <isheriff@google.com> Add WifiConfigStore to manage networks

Split configuration management into a seperate class,
next to come is per configuration ip management as part
of WifiConfigStore.

Bug: 2876746
Change-Id: I44b85fb0e23a83d97a5052ba6beafe06f2027f5a
ifiConfigStore.java
ifiStateMachine.java
37e65ebb7eb932e1a144b1cab262e11ca5fd109b 30-Aug-2010 Robert Greenwalt <robdroid@android.com> Rename NetworkProperties to LinkProperties

Also add copy constructors and use them when giving out data.

Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615
ifiManager.java
ifiStateMachine.java
ifiStateTracker.java
585ac0fc8dde3fe35ec4c71c8f215f2c84139b8b 27-Aug-2010 Robert Greenwalt <robdroid@android.com> resolved conflicts for merge of 4ea54f44 to master

Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56
ifiStateMachine.java
e3f55d45cf91177cf610f95da67435c3719d1877 27-Aug-2010 Ben Dodson <bjdodson@google.com> Merge "Updated documentation for upcoming fix for @code tags"
4e8620f868e2490782ebb960404140ea9482c91d 25-Aug-2010 Ben Dodson <bjdodson@google.com> Updated documentation for upcoming fix for @code tags

Change-Id: Id7b163179132b9cf180afecb4e9e10ee39bcd415
ifiConfiguration.java
bbc85ab3229ea51b1358711fba99e3bf170ab825 26-Aug-2010 Irfan Sheriff <isheriff@google.com> Add WifiStateMachine details for dump

Change-Id: I3015411dd11f3df57422b41125d4db44be1e0854
ifiStateMachine.java
a2d5fbf569cb81d3d89bf61393c9ebd2c8a54aed 24-Aug-2010 Irfan Sheriff <isheriff@google.com> fix connectNetwork corner cases

1. if we try to use the api for an already connected network
we could end up in disabling other networks since we dont
get events back in that scenario. fix to ignore connect.

2. force transition to mDisconnectingState since we expect
a disconnection when we connect to a network. If we
are in the other child states in ConnectModeState and dont
transition, we could ignore the connection/disconnection
which would cause other networks to get disabled.

Change-Id: I603d504af21c5ba09411d5e2515b8031b9f8a97a
ifiStateMachine.java
50454c2718fe4f2921da02670f8cc69fd0baf9da 25-Aug-2010 Irfan Sheriff <isheriff@google.com> sendBroadcast needs protection

we need to check if system is ready for broadcasts

Change-Id: I342c51ae85c9ca1aa0cb289c673a20f582eb0423
ifiStateMachine.java
9e6222f4c126252c9950d072ab67d8b849d17643 23-Aug-2010 Irfan Sheriff <isheriff@google.com> cache configured networks

Remove the sync-wait call into state machine for
fetching configured networks

Bug: b/2876746
Change-Id: I4434627abb78f7112fd613008c4c77374ac1b966
ifiConfiguration.java
ifiStateMachine.java
d8134ff9d8178470116108bb7815fd0ab2a606a1 23-Aug-2010 Irfan Sheriff <isheriff@google.com> Clean up synchronous calls

We dont plan to have asynchronous versions of the existing
synchronous calls since we have added more powerful
asynchronous calls. Remove functionality to check for
synchronous calls.

Also, remove unused sync call for fetching status

Change-Id: I2982cb7b2aabc88a63289d49686a6e3645085263
ifiStateMachine.java
b65444df013020000a0d60491e9cf14c950c9500 21-Aug-2010 Irfan Sheriff <isheriff@google.com> am 80db4381: Merge "DO NOT MERGE Enable all networks on screen on" into gingerbread

Merge commit '80db4381c010c4dec74c2bf1e02380759e4ff97b' into gingerbread-plus-aosp

* commit '80db4381c010c4dec74c2bf1e02380759e4ff97b':
DO NOT MERGE Enable all networks on screen on
fae66c3ab59c741aad631e6f2dd82b77b1d4a353 16-Aug-2010 Irfan Sheriff <isheriff@google.com> DO NOT MERGE Enable all networks on screen on

Connectivity to a disabled network never happens.
An old dhcp issue for example prevents
connectivity again in future. Allow connectivity
on all networks on screen on.

Bug: 2129037
Change-Id: I42afc17ddb5cd238e46d7e50f1b6e708e107b35d
ifiStateTracker.java
2338f48ddb3d1746c2d46df85fdc4dcd6cfa240b 20-Aug-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 34df5ccc to master

Change-Id: I55558b2ab9452b2a819a1fce5b3ee5af29688e98
cdea9193f2745fd46e69858a7c5570d95f8182dc 20-Aug-2010 Irfan Sheriff <isheriff@google.com> update ssid in WifiInfo

Bug: 2876746
Change-Id: I58295e01f07f168e234ab344065fe50047902c76
ifiStateMachine.java
f99819e47cbef2ec066a21b426c7e6fe95e3de48 20-Aug-2010 Irfan Sheriff <isheriff@google.com> clean up scanresults on exit from driver start state

Bug: 2934389
Change-Id: I918bb9e198aba0bdbb2be356a680789c9678e47c
ifiStateMachine.java
e498475b187277309c81b38240c7e71ec049e369 19-Aug-2010 Irfan Sheriff <isheriff@google.com> asynchronous driver commands

Make some of the common driver commands scan/disconnect/reconnect/reassociate
asynchronous. We already have broadcasts to indicate results.

Change-Id: I343c6be077fb11a3d488e586ab10ab2373b269d8
WifiManager.aidl
ifiManager.java
ifiStateMachine.java
4c0d81b8add0372cc7194b17cc6d2bfc58baacd1 19-Aug-2010 Daniel Sandler <dsandler@google.com> Fix divide-by-zero when calculating signal level over a large output range.

Change-Id: I17eff6fb458532465a836414e1973a8d5b7c715b
ifiManager.java
34df5ccca4c31d131eccc96c2ebf5cc698edfe21 18-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Merge "fix build" into gingerbread-plus-aosp
a00f8db5ef724bf9a695ac43c1538557f2dffe1f 18-Aug-2010 Jean-Baptiste Queru <jbq@google.com> fix build

Change-Id: I13a6a34e8eae73b046769df365be8a46489bd111
ifiStateTracker.java
aea40e3c5746d754f96b76b7845bbbf7effe2677 18-Aug-2010 Irfan Sheriff <isheriff@google.com> am a1af0d7c: Merge "Fix SDK build" into gingerbread

Merge commit 'a1af0d7c80a0119630926810644e6cdee481ba80' into gingerbread-plus-aosp

* commit 'a1af0d7c80a0119630926810644e6cdee481ba80':
Fix SDK build
3719f8568e809ffd30f90adc38993256a9d3d066 18-Aug-2010 Jean-Baptiste Queru <jbq@google.com> DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp

Change-Id: I29703133654f0f80a4425914d290e9dc50cbc3cc
f93951851052f14e3263adff22266b61f487b018 18-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Revert "- updates NetUtils to use new libnetutils headers"

This reverts commit 9bf3bb21c097cc96f30d9bf3ec7dea62a74a738b.
ifiNative.java
ifiStateTracker.java
4d32d81bd7abb77ab9663f4f800bd96dca0c0e03 18-Aug-2010 Irfan Sheriff <isheriff@google.com> Fix SDK build

Add the tag and documentation when we open up the high perf mode

Change-Id: I921e46a7519561e59fb917d08a36dd1d3d2fc7f3
ifiManager.java
8c11e952305327183db9f7be719e4c94fde15a7c 13-Aug-2010 Irfan Sheriff <isheriff@google.com> DO NOT MERGE WifiLock extensions for high performance mode

Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: I8b33d307f3d569bc92ba2139b9ed224ffc147547
ifiManager.java
ifiNative.java
ifiStateTracker.java
c7a98341b053bd8090accca151e8f3522f2dd126 14-Aug-2010 Wink Saville <wink@google.com> Add documentation to NetworkStateTracker and a small change to the API.

Also, removed some unused NetworkStateTracker event codes.

The API change was to add context and target to startMonitor, this makes
it easier to document what the actual interface contract is.

Change-Id: If9b52486c3c281fe4794bc78417c8b03888414b1
ifiStateTracker.java
993f85f3194000d0eb212f361431c9319548b144 14-Aug-2010 Robert Greenwalt <robdroid@android.com> am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread

Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp

* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
DO NOT MERGE Always set/remove default routes.
b738fb9938631a2e4540f9a9308f49e6be5565b8 13-Aug-2010 Robert Greenwalt <robdroid@android.com> DO NOT MERGE Always set/remove default routes.

Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on teh same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: Ifdf49080fa0413a4d826813706c809975a562dfa
ifiStateTracker.java
876247784ee6202066abdefd8366f2e09e681fab 07-Apr-2010 Mikael Kanstrup <mikael.kanstrup@sonyericsson.com> DO NOT MERGE WLAN: Reset power save mode to startup value after DHCP response.

When the driver was configured to run with power save mode disabled the
power save mode incorrectly got reverted back to AUTO mode right after
DHCP response. The power save mode value is now saved so that the device
properly reverts back to a previous mode after DHCP response.

Change-Id: Ie68cd107872d233bf422e24130a1eb9f6432db91
Bug: 2834260
ifiNative.java
ifiStateTracker.java
e04653cbd0e8303eba92088344312b827e6b0bab 09-Aug-2010 Irfan Sheriff <isheriff@google.com> Asynchronous API

Add asynchronous API for simplified connect, save
and remove.

Add a SUPPLICANT_CONFIG_CHANGED_ACTION broadcast to
notifiy a supplicant configuration change.

Change-Id: I69ae116246094de4a469cb2af5baf37e5ad4d6dd
WifiManager.aidl
ifiManager.java
ifiStateMachine.java
994c57828f5bc5519197e8b8ed2d2cba40429ce0 11-Aug-2010 Irfan Sheriff <isheriff@google.com> Fix build

A local change had remained.

Change-Id: Iad01d6da7f6cc75b470296383e1121d21008883a
ifiStateMachine.java
0d25534fed91f636def5776ddc4605005bd7471c 28-Jul-2010 Irfan Sheriff <isheriff@google.com> Split WifiStateMachine from WifiStateTracker

Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service

Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053
WifiManager.aidl
ifiManager.java
ifiMonitor.java
ifiStateMachine.java
ifiStateTracker.java
34fe791453ec139086237d9ac902d9a502de0798 29-Jul-2010 Irfan Sheriff <isheriff@google.com> Handle loss of supplicant events at start

If the supplicant events are lost even before connection,
we stay stuck without doing IP address.
The earlier implementation used polling at connection to handle
this case.
A disconnect after connection handles this cleanly.

Bug: 2876987
Change-Id: I7509c5f332f87b91e1ff8438cf859a0e49df2e6d
ifiStateTracker.java
22c2b25ad7c6ed175831bd2421ee110a343c78dd 28-Jul-2010 Irfan Sheriff <isheriff@google.com> sticky broadcasts dont need system ready check

Fix an issue where checking for system ready status
for sticky broadcasts can lead to boot up with wifi
turned on and settings showing incorrect status.

Bug: 2876746
Change-Id: Iae39855c255513e28a13bd819b3d14d81fbaba43
ifiStateTracker.java
a2a1b911a31dd94ee75e94845f762b91f1db1368 07-Jun-2010 Irfan Sheriff <isheriff@google.com> Refactor WifiStateTracker

Implement WifiStateTracker as a HSM.

Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb
ifiManager.java
ifiMonitor.java
ifiNative.java
ifiStateTracker.java
47f69fe2999e46004f2f2463b70d38de9ff7079a 16-Jun-2010 Robert Greenwalt <robdroid@android.com> Pass network properties to ConnectivityService.

Used as a bag to hold ipaddr, gateway, dns, proxy info.
addr's are InetAddresses for v4/v6 use. Cleaning up some old v4-only code

bug:2655015
Change-Id: I7ac886fe5c519e8bab42f49cd82a5189d9c9ab59
ifiStateTracker.java
30683b2ad0754cc834ccdc07829dbf5b46563b0b 26-Jun-2010 Irfan Sheriff <isheriff@google.com> am 53dca61f: am 9005e7f4: Merge "Add setWifiApConfiguration interface" into gingerbread

Merge commit '53dca61f26f4ff348418add60599213297acc899'

* commit '53dca61f26f4ff348418add60599213297acc899':
Add setWifiApConfiguration interface
53dca61f26f4ff348418add60599213297acc899 26-Jun-2010 Irfan Sheriff <isheriff@google.com> am 9005e7f4: Merge "Add setWifiApConfiguration interface" into gingerbread

Merge commit '9005e7f4297a3f04263e81cb61ba2703d5667b0a' into gingerbread-plus-aosp

* commit '9005e7f4297a3f04263e81cb61ba2703d5667b0a':
Add setWifiApConfiguration interface
17b232b5b59ab91ab543b87e849583678a000f9b 24-Jun-2010 Irfan Sheriff <isheriff@google.com> Add setWifiApConfiguration interface

Bug: 2538623
Change-Id: I779044173a2fa0e9b851ea92aeec5ca25eb9c86f
WifiManager.aidl
ifiManager.java
3b9f0a33a110d01e587ffd5ec7708af68723ad4b 21-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Recover a handful of commits that were reverted earlier
ifiStateTracker.java
6c9a30045b1e6b9ef5d756e0a9657576c546c9bd 21-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from froyo-plus-aosp

Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
bd580127fca2797ba1a0f6653fe4cb2fd427ec83 16-Jun-2010 Irfan Sheriff <isheriff@google.com> am 1af48920: am f897b443: Fix driver stop check

Merge commit '1af489205a3942630e6203237213e98ef53d4118'

* commit '1af489205a3942630e6203237213e98ef53d4118':
Fix driver stop check
1af489205a3942630e6203237213e98ef53d4118 16-Jun-2010 Irfan Sheriff <isheriff@google.com> am f897b443: Fix driver stop check

Merge commit 'f897b443fed5c88c6b12e3fa1da72f231db67673' into gingerbread-plus-aosp

* commit 'f897b443fed5c88c6b12e3fa1da72f231db67673':
Fix driver stop check
f897b443fed5c88c6b12e3fa1da72f231db67673 15-Jun-2010 Irfan Sheriff <isheriff@google.com> Fix driver stop check

- Remove check for supplicant command: setScanResultHandling
- Add check for stopDriver
- Fix condition for rest of commands

Bug: 2771298
Change-Id: I1262b2228814c4f6a4c251390af2f445c5f47234
ifiStateTracker.java
14f2ef4c9da27a3d58d65dc9f684c5f764ee279a 15-Jun-2010 Robert Greenwalt <robdroid@android.com> Move the net transition wakelock to ConnService.

When the default network goes down we lose the wake-on-incoming-data capability
until the new net is brought up and apps rebuild their connections. We fixed this
in Wifi, but it's a general connectivity issue, not a wifi issue so moving the
mechanism to connecitivty so other networks can use it.

bug:2734419
Change-Id: I39b5d825eb6b548bd9bb8f179b89254f4db53147
ifiStateTracker.java
7d10df4e2402c55dc827cb6675a15957071c00af 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
9bf3bb21c097cc96f30d9bf3ec7dea62a74a738b 09-Jun-2010 Szymon Jakubczak <szym@google.com> - updates NetUtils to use new libnetutils headers
- updates WifiStateTracker to track net.XXX.dnsX properties for name servers
- removes dhcp from WifiNative (use NetworkUtils instead)

Change-Id: Ic69ff253e8784cad34e9291e7970ee38bfa235b9
ifiNative.java
ifiStateTracker.java
fa804aa367e4c5c52c8a92d489b1a4ef405811f7 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I227bf1b5f1de8f858df72d58a4463aed5cc09cbc
baccb91ece4ac650cae465ae36f5d7397a1f32af 02-Jun-2010 Kenny <gongwuchun@gmail.com> Fix the ssid display issue

Reproduce steps:
1. Set a special AP name that contains "=" (looks like "-=^-^=-");
2. Connect to this AP;
3. The display of ssid will be incorrect;

Change-Id: Idc7433a42cf59932f5fb147f5500e0175f745399
ifiStateTracker.java
e377032899fd7a9f88ad1313847e77c098b9f248 14-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 864c68ea: merge from froyo-plus-aosp

Merge commit '864c68ea452baa0f4f298faf2155af45a9b6d60c'

* commit '864c68ea452baa0f4f298faf2155af45a9b6d60c':
Added an addAll to the ArrayAdapter
WLAN: Reset power save mode to startup value after DHCP response.
Add PageUp and PageDown hot keys
Should accept "application/vnd.wap.multipart.alternative" message.
replaced deprecated getIntent with parseURI
864c68ea452baa0f4f298faf2155af45a9b6d60c 14-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from froyo-plus-aosp

Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
0631c608b0997efe5c0bd8e8955e65f1a7b3f32c 12-Jun-2010 Irfan Sheriff <isheriff@google.com> merge from open-source master

Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc
9e30a6e374c0ac154d6ea256f50597c4b0b63cca 11-Jun-2010 Irfan Sheriff <isheriff@google.com> am 749defb0: am f4f614f5: am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
f4f614f5edeeceddf1145df73b30f7066d00d7fa 11-Jun-2010 Irfan Sheriff <isheriff@google.com> am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo

Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken

* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
60d0d22c75ef49d151290592652b92f3e199679b 10-Jun-2010 Irfan Sheriff <isheriff@google.com> Remove indefinite DHCP retries

Replace indefinite DHCP retries
with a sufficiently large retry count

Bug: 2761057
Change-Id: I4570b74476aa78c71c73e06c2aafac33d924e867
ifiStateTracker.java
d649c12815bcf944b2c97371f3f60716a42a1557 10-Jun-2010 Irfan Sheriff <isheriff@google.com> Make NetworkStateTracker an interface

As part of the WifiStateTracker cleanup, need
to have NetworkStateTracker as an interface.

Change-Id: I2ac48d7e4c7274ac4df40bc3b8591b182956a936
ifiStateTracker.java
ea8bd1d1676dd96f8f9726bb8f67fa18dec7b9c1 07-Apr-2010 Mikael Kanstrup <mikael.kanstrup@sonyericsson.com> WLAN: Reset power save mode to startup value after DHCP response.

When the driver was configured to run with power save mode disabled the
power save mode incorrectly got reverted back to AUTO mode right after
DHCP response. The power save mode value is now saved so that the device
properly reverts back to a previous mode after DHCP response.

Change-Id: I5035aad10146812ecef1be8ea4b22a03e230ccc9
ifiNative.java
ifiStateTracker.java
02648a4b8422733ed401f07edf8e426318bb2f8d 18-May-2010 Robert Greenwalt <robdroid@android.com> Clean up APN notifications.

Add APNType info to notifications so you can tell what's happening. Now, even if a new APN
shares a connection with an already-connected-to- apn type, the new type will get all
the connecting and connected messages on connect and disconnecting/disconnected on disconnect
even though the shared connection remains connected.

Cleaning out the hacks MobileDataStateTracker needed to deal with the old situation.
bug:2226092

Change-Id: Iddd7421d6b91cda7c8405f9c3d5404ac04ef8e42
ifiStateTracker.java
740e39be6af3e366a4b82c030b5ea67ab144b42a 02-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> Pass BluetoothDevice to the Bluetooth Headset calls.

This is to support multiple headsets at the same time, atleast
at the framework level.

Change-Id: I91d05c6c2828c9a09d00806d5e79f1e9c9c7cf84
ifiStateTracker.java
2d1a6e9429ea5cec8aa45e0508f97ab4573c9f09 19-Apr-2010 Irfan Sheriff <isheriff@google.com> Reset notification state on wifi enable

Bug: 2600111
Change-Id: Ifaa63cd7c05dfa27fbd851de6f7e92f7fc38907b
ifiStateTracker.java
3bf504df9fc1971078fdde7eed418a0dd8f601e2 23-Mar-2010 Irfan Sheriff <isheriff@google.com> Fix WakeLock issue for driver stop

Due to message removal, wakelock could be held forever.

Do a timer only based wakelock release until we do this
more cleanly in ConnectivityService for later release.

Also, add an optimization to prevent use of wakelocks when driver is
already stopped.

Bug: 2529883
Change-Id: Ia1c2ddd44213ef3aa609855613bf155945bef8e4
ifiStateTracker.java
49de491379fc56960d00ff6c52472fe1a7d907a7 22-Mar-2010 Irfan Sheriff <isheriff@google.com> Use a single mWifiState instance

mWifiState was split up to speed up access
of wifi state when things are synchronized.
Use a single atomic state variable throughout.

Change-Id: I345981e3ffa3d2b0b7e70a5c6efc43185cba9062
ifiStateTracker.java
90dd21eff5f4799dd770a6e1a0390ac68734429a 22-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> Make getting wifi state lockless.

Previous it was synchronized on the same lock that was held while
transitioning wifi states, effectively making it impossible to ever
find out about such states, and worse: making calls during transitions
block.

This manifested itself in a really laggy power control widget, which
I'm working on fixing in general in a separate change.

Change-Id: Ia34af98c73d7f5662e41360a213df87f6adaf130
ifiStateTracker.java
4f31a00376fa0907ab167af51525455ef4b4e638 18-Mar-2010 Irfan Sheriff <isheriff@google.com> Fix null pointer exception

Bug: 2525763
Change-Id: If2f334187af26e0352d754d7e00a9ca3efc5dffa
ifiStateTracker.java
9ab518ad793385f8405edf19363fe825fb64f5f8 13-Mar-2010 Irfan Sheriff <isheriff@google.com> softAp framework changes

Remove AP persist settings
Add new netd interface
Handle errors
Handle AP config change
Bug: 2413908
Change-Id: I31a1221ef5479da8d4a2620f0f0ee0b62539bc69
WifiManager.aidl
ifiManager.java
0f344060096329f091af20a16d69547a47c1a9d5 10-Mar-2010 Irfan Sheriff <isheriff@google.com> Clean up native access from framework

Driver commands should be issued when driver has started.
Supplicant commands should be issued when Wi-Fi is enabled
Bug: 2339709
Bug: 2371609
Change-Id: I9ba6ddfa0cf4c4b8ca049b0eb7eaaa8edb42bad1
ifiStateTracker.java
a8fbe1fb74d3bd40b73c90c85ac25e5176475ca5 09-Mar-2010 Irfan Sheriff <isheriff@google.com> Re-organize access to native interface through WifiStateTracker

Bug: 2339709
Change-Id: Ibb2eeb09b83dc24897116ea15a9016f81a08d442
ifiMonitor.java
ifiNative.java
ifiStateTracker.java
5321aef4a22daef6ed01ed48d936cdd82f2e38b7 12-Feb-2010 Irfan Sheriff <isheriff@google.com> Wifi AP framework changes first pass

Bug: 2421638
Change-Id: Ic5ea8f7560a7fe5e1b0769daa5d92cc33eefc692
WifiManager.aidl
ifiManager.java
c1ba7431a45dbf10f211e7b0bbf5b03e64bf020c 24-Feb-2010 Irfan Sheriff <isheriff@google.com> Remove redundant interface disable

Bug: 2274930
Change-Id: Ia1eafe422f6e18b826e53e72a306dd2961b948a6
ifiStateTracker.java
102d05fa9135bef5c6b875f9a6485566b06ebd18 05-Feb-2010 Irfan Sheriff <isheriff@google.com> get DHCP IP on each connection

The IP state was not being refreshed when the supplicant transitions
from COMPLETED to ASSOCIATED to COMPLETED. This can lead to
a connected state with no real connection due to old IP settings.
The fix refreshes IP on each connection.

Bug: 2329261
Change-Id: I38cd56369ee2d8ab3e0f06f5c9f5712b9b2f35a0
ifiStateTracker.java
05d72117f9b449914979b008c17edd6c5645565b 28-Jan-2010 Irfan Sheriff <isheriff@google.com> Handle error strings from monitor connection

Bug: 2399119
Change-Id: I481cfbfb11fb453659134004aafa3df236ba050b
ifiMonitor.java
0049a1bf3f8bae3a10cfeff38aefce215bf1298b 14-Jan-2010 Irfan Sheriff <isheriff@google.com> Blacklist APs instead of disable

We currently disable networks upon too many reconnects. This leads to asking
the user input for reconnects. Blacklist it instead.

Bug: 2129037
Change-Id: I23d69daf3964c066ed7f70d32fefb81016f19aa2
ifiMonitor.java
ifiStateTracker.java
7aac5547daf54005243c5d685cf60c5a4ff74a44 23-Dec-2009 Irfan Sheriff <isheriff@google.com> Synchronize all WifiNative calls

Some of the native calls were left unsynchronized in the framework. Pre-empted IOCTL call
interrupted by another call from the framework cannot be handled in the driver.

Bug: 2310455
ifiStateTracker.java
1c633fc89bae9bf0af6fe643ac7ad2e744f27bed 09-Dec-2009 Dianne Hackborn <hackbod@google.com> Implement API to have new broadcasts replace existing broadcasts.

Use this in various places where it should serve no purpose to deliver
both broadcasts. This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
ifiStateTracker.java
7614d3d819315b1ca15088e617f12d0f0ea41b06 09-Dec-2009 Robert Greenwalt <robdroid@android.com> am 68b15b68: Porting change I064698b3 from mr2 to eclair.

Merge commit '68b15b68497e373fe63a13f11e18349a738a7989' into eclair-mr2

* commit '68b15b68497e373fe63a13f11e18349a738a7989':
Porting change I064698b3 from mr2 to eclair.
68b15b68497e373fe63a13f11e18349a738a7989 09-Dec-2009 Robert Greenwalt <robdroid@android.com> Porting change I064698b3 from mr2 to eclair.

Add support for "HANGED" driver state - we'll reboot the driver when requested (by the driver).

bug: 2310372
ifiMonitor.java
ifiStateTracker.java
f75aa36fc86989ca3bae2f46207e6b897a32d7ae 23-Oct-2009 Robert Greenwalt <robdroid@android.com> Add wifi "HANGED" driver state triggering reload.

The driver can now report to us that they are hosed and we'll shut
down wifi and restart it - only to be used as a last resort.

Also fixing synch problem with updateWifiState.

bug: 2173119
ifiMonitor.java
ifiStateTracker.java
e2d155a51e68694e17fa6e27d05c928215a5dbcf 21-Oct-2009 Robert Greenwalt <robdroid@android.com> Add a new API for initing Wifi multicast filtering

Gets rid of the old method which generated Log noise.

bug: 1973855
WifiManager.aidl
ifiManager.java
ifiStateTracker.java
1538dba4b00f767ddc4010e05b5983d6377999c2 08-Oct-2009 Robert Greenwalt <robdroid@android.com> Make FWK start a wifi scan if supplicant forgets. (do not merge)

Waits 15sec after getting a DISCONNECTED or INACTIVE state. Also tracks
the number of supplicant state transitions. After the period is up
if we haven't received any more supplicant state transitions, it requests a scan.

bug: 2168081
ifiStateTracker.java
b106118c2cc558a9ea2ade69ff47766280a35e17 08-Oct-2009 Robert Greenwalt <robdroid@android.com> Make FWK start a wifi scan if supplicant forgets.

Waits 15sec after getting a DISCONNECTED or INACTIVE state. Also tracks
the number of supplicant state transitions. After the period is up
if we haven't received any more supplicant state transitions, it requests a scan.

bug: 2168081
ifiStateTracker.java
bb5626c569bb9ccedd7b7d4197a2dace4c997c49 01-Oct-2009 Robert Greenwalt <robdroid@android.com> Stop bringing the wifi interface up on reset.

The driver will bring up the interface when needed and bring it up
at reset time has caused some problems.

bug: 2144870
ifiStateTracker.java
5f55d8c9d447f492aed955ac29454e0c482a4956 22-Sep-2009 Chung-yih Wang <cywang@google.com> Fix the incorrect field name in EAP wifi network.

The field identity should not be "anonymous_identity".
ifiConfiguration.java
7121ac5644f222763c99975bcce93c28775a6386 22-Sep-2009 Chung-yih Wang <cywang@google.com> Fix the issue of 'Wifi framework is not aware of state change'

Problem:
Connect to AP with WEP security.
Change AP's WEP password.
Phone will quickly reassociated (less than in 5 sec) and will not restart full "reconnect".
Indication will show "connected" but it will be no network access.

Fix: (for non-static IP only)

With WEP mode, the association could be successful if we change the AP's WEP password. However,
the phone wont be able to send/recv any traffic with the old password. What we could quickly
fix here is to send the DHCP request if the network is not configured to use static IP. We
can do nothing but ping access point to see if it we are able to communicate with it.
ifiStateTracker.java
4282a5bad44b1b994a26a8eb02051f29f410d33a 17-Sep-2009 Robert Greenwalt <robdroid@android.com> Reintroduce wifi RssiApprox, reducing driver calls

Only do the full signal strength calc when we need to, otherwise use
an approximate value.

This change was introduced a while back but was lost in some merge.

bug: 2125543
ifiStateTracker.java
8e9ef0e78970d0ca399bd3c9aaf9011f0e4aaebe 16-Sep-2009 Chung-yih Wang <cywang@google.com> Add the hide for the inner class definition.
ifiConfiguration.java
4337476a6669ce52549ce4a60f5e4d07f8e3033f 16-Sep-2009 Chung-yih Wang <cywang@google.com> Fix the missing part for reading enterprise fields in wifi configuration

+ refactor the enterprise fields.
ifiConfiguration.java
7c9bf7caa2936e8b76598be9fffea980d81c61d3 12-Sep-2009 Robert Greenwalt <robdroid@android.com> Don't init wifiChannels until after supplicant up

The supplicant can take up to 15 seconds to start - setting the number of wifi channels
immediately after requested wifi start often will fail.

Changed to set the number of channels when the supplicant is reported as alive.

bug:2083601
ifiStateTracker.java
4a51c20ce607c74914f90fd897f04080121ac13b 22-Aug-2009 Dianne Hackborn <hackbod@google.com> I am getting tired of the java doc warnings, so fix them.

Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
ifiManager.java
bd022f423a33f0794bb53e5b0720da2d67e4631c 15-Aug-2009 Nick Pelly <npelly@google.com> Bluetooth: API change.

Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).

IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java

TODO:
Javadoc
ifiStateTracker.java
0cbdb39991d65909e00700db0c8e9e9447365882 30-Jul-2009 Robert Greenwalt <robdroid@android.com> am 41c10433: Fix MulticastLock API to match WifiLock API.

Merge commit '41c104339951e0e5e78240e1f48455c21b3ba5fd'

* commit '41c104339951e0e5e78240e1f48455c21b3ba5fd':
Fix MulticastLock API to match WifiLock API.
41c104339951e0e5e78240e1f48455c21b3ba5fd 30-Jul-2009 Robert Greenwalt <robdroid@android.com> Fix MulticastLock API to match WifiLock API.

Adds option to make lock refcounted or not. Fixes 2017680.
ifiManager.java
6ee4b5b504a2542b47befe5d6c5f9aaff9b40ed9 28-Jul-2009 Mike Lockwood <lockwood@android.com> Wifi: Make sure the interface is up before telling supplicant to start the driver.

This fixes a problem that resulted in the interface not being up when resuming
an authenticated connection.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ifiStateTracker.java
d72aa3b92c206092d3b3ce563e0ebf25e1a0be07 22-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 356d4a14: Merge change 8172 into donut

Merge commit '356d4a14aa96cf52c16f7a4d381044ce28b01af3'

* commit '356d4a14aa96cf52c16f7a4d381044ce28b01af3':
Add the phase2 field for EAP WiFi configuration.
b96ea206d93b6cd7fe2106a8427d41a8e90d8322 22-Jul-2009 Chung-yih Wang <cywang@google.com> Add the phase2 field for EAP WiFi configuration.
ifiConfiguration.java
e2a5385c70b48b57476a0c8c52bad4ea40398641 15-Jul-2009 Mike Lockwood <lockwood@android.com> resolved conflicts for merge of f7703519 to master
f32be166d56302b59c242a1296a6b03862f3c061 14-Jul-2009 Mike Lockwood <lockwood@android.com> wifi: Disable RSSI polling when the screen is off.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ifiStateTracker.java
0900f3657664d9046e6723825fd32b244eef2b6c 10-Jul-2009 Mike Lockwood <lockwood@android.com> wifi: Keep the WLAN network interface up whenever wifi is enabled.

We now only bring it down briefly and bring it back up again when
we want to reset the interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ifiStateTracker.java
622f82a0c78aa69d9b3b29ea0617cb8002b57c16 10-Jul-2009 Mike Lockwood <lockwood@android.com> WifiService: Remove hidden AP counting logic for active/passive scanning mode.

Apparently this code was not 100% correct, and now the Wifi driver is responsible
for setting the scan mode to active for hidden networks, so this is no longer needed.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ifiStateTracker.java
6811355d9683412cb3651e75c59c3256ceaddcec 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 463aacfb: Merge change 6661 into donut

Merge commit '463aacfbd220c9ef2f6ed915d54092289fdac05b'

* commit '463aacfbd220c9ef2f6ed915d54092289fdac05b':
wifi: WifiManager.startScan() will now do passive scans by default.
a5ec95cdb1a7d2024249277dff1f99d0046c9b56 08-Jul-2009 Mike Lockwood <lockwood@android.com> wifi: WifiManager.startScan() will now do passive scans by default.

Active scans will only happen if a hidden AP is in use, or if the new method
WifiManager.startScanActive() is called.
This fixes some audio playback problems with bluetooth A2DP.

Signed-off-by: Mike Lockwood <lockwood@android.com>
WifiManager.aidl
ifiManager.java
ifiNative.java
ifiStateTracker.java
58c714c41ac3799b0b408affd9804056070d358c 06-Jul-2009 Chung-yih Wang <cywang@google.com> am 699ca3f2: Add password field for WiFi configuration.

Merge commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91'

* commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91':
Add password field for WiFi configuration.
fca3ae1517b19c3cd40b761cd4bc134e98c0c565 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 3bc64a2c: Merge change 6088 into donut

Merge commit '3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc'

* commit '3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc':
WifiManager: Limit the number of WifiLocks that can be active simultaneously.
699ca3f2518360ea3250ff5a0e5d39e122c64a91 04-Jul-2009 Chung-yih Wang <cywang@google.com> Add password field for WiFi configuration.

1. the certtool.h is modified for avoiding the side effect,
for saving the configuration with wpa_supplicant.
2. put the loadLibrary back in CertTool.java
3. Fix incorrect JNI declarations.
ifiConfiguration.java
617750604c69e6068f68266d0e30324273aa990e 02-Jul-2009 Mike Lockwood <lockwood@android.com> WifiManager: Limit the number of WifiLocks that can be active simultaneously.

This is to prevent a bad app from using up all the global references in the
system process due to allocating too many DeathRecipients.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ifiManager.java
56c59da434354e1efaebbd0e5c135814605f9842 10-Jun-2009 Mike Lockwood <lockwood@android.com> WifiStateTracker: Add support for positive RSSI values.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ifiStateTracker.java
91f22f901bee5d52d81ca4070a1b187ac8b90dad 09-Jun-2009 Robert Greenwalt <robdroid@android.com> Use new wifi cmd rssi-approx when polling.

Cheaper approx call should be used when polling every 3 sec for
wifi signal strength. Fixes bug 1903653.
ifiNative.java
ifiStateTracker.java
36d3ebb880e922859d4fd83792e13069072c19b2 06-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 19cd309f: Merge change 3017 into donut

Merge commit '19cd309f9eccdf8454dc6e5076013588b7a170a3'

* commit '19cd309f9eccdf8454dc6e5076013588b7a170a3':
Add the EAP related fields for WiFi configuration.
5069cc78497209c035a7019b2f407bd1ed57f64a 03-Jun-2009 Chung-yih Wang <cywang@google.com> Add the EAP related fields for WiFi configuration.

-- added the EAP/802.1X related fields in WifiConfiguration for
supporting EAP/802.1X authentication.
-- hid the related fields for now.
ifiConfiguration.java
96cdc61c69aa735e65295a50e3e2922425b3c877 28-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 1e2e44e9: Merge change 2365 into donut

Merge commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc'

* commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc':
Fix wifi multicast API for public use.
Revert "Bug fixes and performance improvements"
fc1b15cfbfc5f69235ec1f367abd7a909381cd05 23-May-2009 Robert Greenwalt <robdroid@android.com> Fix wifi multicast API for public use.

Applying API review comments and taking it public.
WifiManager.aidl
ifiManager.java
ifiStateTracker.java
b5010cc3c33c74cc406a70f34f93d330a3f0db6a 22-May-2009 Robert Greenwalt <robdroid@android.com> Add carrier/mcc factors to wifi-channel decision.

Uses ro.carrier and MCC when available to try to set
(non-persistingly) the number of allowed wifi channels.
Part of the fix for 1625953.
WifiManager.aidl
ifiManager.java
ifiStateTracker.java
58ff0217a617d5b03d18f0ef532f254f8ba6de2b 20-May-2009 Robert Greenwalt <robdroid@android.com> Increment BatteryStatsImpl's VERSION.
That'll make it stop trying to interpret older records with the new format.
Also applied other comments involving name changes to remove un-needed 'Wifi' labels in WifiManager API, etc.
WifiManager.aidl
ifiManager.java
ifiStateTracker.java
d9c32bc838cb618dcbc1e48df02a34b6596b8930 18-May-2009 Mike Lockwood <lockwood@android.com> WifiService: Wifi power management change

Put Wifi into an idle state immediately if the screen is turned off and the Wifi interface has no IP address.
We will continue to keep Wifi up for 15 minutes in the case where the screen is turned off when Wifi is fully connected.
This will allow us to go into a low power mode faster when Wifi is not actively being used.
It also avoids bringing up Wifi if the user just turns on the screen for a few seconds to check the clock, etc.

Fixes bug b/1736920

Signed-off-by: Mike Lockwood <lockwood@android.com>
ifiStateTracker.java
5347bd4cda2b6afc18f8acab48e52131f35ed13c 14-May-2009 Robert Greenwalt <robdroid@android.com> Add wifi multicast filter api (enable/disable).
Fixes 1833432. Automatically re-disables any request when the app
exits/crashes. Also hooked into Battery Stats for power managment analysis.
WifiManager.aidl
ifiManager.java
ifiStateTracker.java
99001278289036a3c645e599ed832943ff1b6e15 14-Apr-2009 Eric Shienbrood <> AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants
that ought to be exposed. Hid and deprecated the single-arg public
constructor for NetworkInfo, and modified a CTS test that was testing it.
Ran the android.net test package to make sure it still works.
Original author: ers
Merged from: //branches/cupcake/...

Automated import of CL 145980
ifiManager.java
f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 11-Apr-2009 Andy Stadler <> AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778
ifiConfiguration.java
5711fadfc48f0e77bc25a91ef36c76acb0d2f55a 28-Mar-2009 Eric Shienbrood <> AI 143266: am: CL 143124 Fix bug #1731826, in which auto-connect to remembered networks does not
take place.
This has the same underlying cause as bug #1739874, so this fixes that
bug as well. The problem was that if the supplicant was in the DORMANT
state at the time a scan-only Wi-Fi lock was released, the command to
stop the Wi-Fi driver would never be issued. This had two main results:
first, the driver would stay awake when the screen was blank and it was
supposed to be sleeping, leading to excessive battery drain, and second,
when the screen was turned back on, there would be no DRIVER-STARTED
event generated (because the driver was already running). The
DRIVER-STARTED event is the trigger for the framework to issue a
RECONNECT command to the supplicant to cause it leave the DORMANT state
and look for available remembered networks.
To assist in tracking down this problem, and any such problems in the
future, I added four counters to keep track of how many times full and
scan-only Wi-Fi locks are acquired and released. The counter values
are output in the dump() method of WifiService. While doing this, I
noticed that because of missing "break" statements, the battery stats
that keep track of how much time Wi-Fi locks are held were including
the time for full locks in the time reported for scan-only locks.
Original author: ers
Merged from: //branches/cupcake/...

Automated import of CL 143266
ifiStateTracker.java
d4c5f8919b0522bcaab41a5863c313fec52d3a79 25-Mar-2009 Eric Shienbrood <> Automated import from //branches/donutburger/...@140679,140679
ifiStateTracker.java
b2a3dd88a53cc8c6d19f6dc8ec4f3d6c4abd9b54 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
ifiNative.java
ifiStateTracker.java
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
WifiManager.aidl
canResult.aidl
canResult.java
upplicantState.java
ifiConfiguration.aidl
ifiConfiguration.java
ifiInfo.aidl
ifiInfo.java
ifiManager.java
ifiMonitor.java
ifiNative.java
ifiStateTracker.java
ackage.html
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
WifiManager.aidl
canResult.aidl
canResult.java
upplicantState.java
ifiConfiguration.aidl
ifiConfiguration.java
ifiInfo.aidl
ifiInfo.java
ifiManager.java
ifiMonitor.java
ifiNative.java
ifiStateTracker.java
ackage.html
15ab3eae2ec3d73b3e8aa60b33ae41445bf83f4b 20-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132569
ifiMonitor.java
da996f390e17e16f2dfa60e972e7ebc4f868f37e 13-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@131421
ifiStateTracker.java
d24b8183b93e781080b2c16c487e60d51c12da31 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
WifiManager.aidl
ifiManager.java
ifiMonitor.java
ifiNative.java
ifiStateTracker.java
b798689749c64baba81f02e10cf2157c747d6b46 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
WifiManager.aidl
ifiManager.java
ifiStateTracker.java
f013e1afd1e68af5e3b868c26a653bbfb39538f8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
WifiManager.aidl
ifiConfiguration.java
ifiManager.java
ifiMonitor.java
ifiNative.java
ifiStateTracker.java
54b6cfa9a9e5b861a9930af873580d6dc20f773c 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
WifiManager.aidl
canResult.aidl
canResult.java
upplicantState.java
ifiConfiguration.aidl
ifiConfiguration.java
ifiInfo.aidl
ifiInfo.java
ifiManager.java
ifiMonitor.java
ifiNative.java
ifiStateTracker.java
ackage.html