Robert Greenwalt
88dadfaa3b
am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
...
* commit '7cff91ea67f89ca963a822daa1b68674bfc0e587':
Frameworks/base: Fix a hashCode implementation
2015-03-16 16:48:46 +00:00
Andreas Gampe
34a7d13a65
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
2015-03-15 14:38:59 -07:00
Vinit Deshpande
fd67bf63e6
am "add 2 side RTT support on scan"
...
merged from goog/mirror-m-wireless-internal-release
6e58424 add 2 side RTT support on scan
2015-03-15 13:42:38 -07:00
Vinit Deshpande
8115762514
am "Passpoint API - Take 1"
...
merged from goog/mirror-m-wireless-internal-release
b21d248 Passpoint API - Take 1
2015-03-15 13:39:33 -07:00
Vinit Deshpande
9e535b86ee
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
2015-03-15 13:39:30 -07:00
Vinit Deshpande
a86f0741c7
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
2015-03-15 13:37:54 -07:00
Vinit Deshpande
fc19120fc7
am "Revert "Initial Passpoint code.""
...
merged from goog/mirror-m-wireless-internal-release
5d7768f Revert "Initial Passpoint code."
2015-03-15 13:37:52 -07:00
Vinit Deshpande
53f8738448
am "Initial Passpoint code."
...
merged from goog/mirror-m-wireless-internal-release
2eba02a Initial Passpoint code.
2015-03-15 13:37:24 -07:00
Vinit Deshpande
b35f4efe15
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
2015-03-15 13:34:56 -07:00
Adam Lesinski
488caeb702
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
2015-03-09 15:28:29 -07:00
xinhe
6e58424f5b
add 2 side RTT support on scan
...
Bug:19533713
Change-Id: I6b7a32aae1a038eb2941f5564d03a4a0286d5bf3
2015-03-04 15:26:49 -08:00
John Spurlock
08c7116ab9
Remove unused imports in frameworks/base.
...
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
xinhe
a357b5adf0
Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev
2015-02-25 23:34:40 +00:00
Vinit Deshpande
c4423a5f0a
Merge "Passpoint API - Take 1" into m-wireless-wifi-dev
2015-02-25 20:04:00 +00:00
Vinit Deshpande
b21d2489c1
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
2015-02-24 18:25:59 -08:00
xinhe
b938c0e203
Do not provide 5GHz option for softap if there is no country code available
...
Bug:19414134
Change-Id: I88da5c3d547522263394403c97147baabae45394
2015-02-23 15:58:21 -08:00
Vinit Deshpande
ab325cbcc8
Introduce onLost event on bssid hotlist [DO NOT MERGE]
...
Change-Id: I84c3174398fea9a1456fb007586c2c559dd3fe4d
2015-02-20 16:35:38 -08:00
xinhe
18ae1d2207
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
2015-02-04 17:19:33 -08:00
Vinit Deshpande
5d7768ff5e
Revert "Initial Passpoint code."
...
This reverts commit 2eba02a11234c9cfa6c597effb4f32349826cee4.
Change-Id: I11da074b8d8990fc01faac3586fd3488f76af326
2015-02-04 01:37:10 +00:00
Jan Nordqvist
2eba02a112
Initial Passpoint code.
...
Change-Id: Ie4800b408d979c31c5cebef7d4a60a9a040d7200
2015-01-30 00:01:32 +00:00
vandwalle
b53d1a2794
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
2015-01-29 05:04:48 +00:00
vandwalle
7e553a06a0
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
2015-01-29 05:00:44 +00:00
vandwalle
8650c03560
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
2015-01-23 18:35:27 -08:00
xinhe
08cbd3e156
Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev
2015-01-16 19:30:09 +00:00
xinhe
a0be0fb270
set softAP on a specified band, including both 2.4 and 5 GHz band
...
Bug:18929692
Change-Id: I6109b477937b0ecab95f5a2b414f2bec9b30e1cd
2015-01-16 10:53:15 -08:00
Vinit Deshpande
7dd2f6b57b
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
2015-01-12 15:30:53 -08:00
Vinit Deshpande
f45acfe096
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
2015-01-12 14:22:45 -08:00
vandwalle
1c9c3f4e9b
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
2014-12-18 22:28:38 +00:00
vandwalle
67878bb5ea
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
2014-12-18 22:26:38 +00:00
vandwalle
72e1d3f538
add debug logs to confirm network flapping issue is fixed
...
Bug:18706288
Change-Id: I59378faafbccfa58639d942c8b8e2e0e815261f4
2014-12-17 16:38:58 -08:00
Vinit Deshpande
c4f389e122
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
2014-12-15 11:14:45 -08:00
Vinit Deshpande
1265a98965
Introduce onLost event on bssid hotlist
...
Change-Id: I84c3174398fea9a1456fb007586c2c559dd3fe4d
2014-12-15 11:14:45 -08:00
Prem Kumar
572ff423a7
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
2014-12-14 20:10:01 +00:00
Prem Kumar
da6ebb4ee2
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
2014-12-14 20:06:28 +00:00
vandwalle
53d1f07073
make sure wificonfiguration scan cache doesnt grow unbounded
...
Bug:18703749
Change-Id: I8e35d602a80b341668d9607db2da3ca6fdb970ae
2014-12-11 02:58:44 -08:00
Jeff Davidson
5d0bf5de0d
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
2014-12-09 01:00:29 +00:00
Jeff Davidson
820ba1f96f
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
2014-12-08 19:36:33 +00:00
vandwalle
93e4192c06
add disable Ephemeral Network API
...
Bug:18525241
Change-Id: I954c53c55c39f6c376b2bae3c7ac4d28246a7f5a
2014-12-05 14:56:43 -08:00
vandwalle
a7af2e8fb6
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
2014-11-26 20:06:44 +00:00
vandwalle
f12fc2e14e
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
2014-11-26 20:02:35 +00:00
vandwalle
da123a6726
make startScan with worksource specific to location scans
...
Change-Id: Ia09dae3e334ef6fd11f2b468e78ad7c2c3cf55e9
2014-11-25 17:35:12 -08:00
Vinit Deshpande
33f97d8304
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
2014-11-19 22:21:38 +00:00
Vinit Deshpande
77fe4c96b7
am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev
...
* commit 'a34f3d30c6a7a4b8863175f009935c61ace42b4e':
Fix WPS docs for LABEL method
2014-11-19 22:13:18 +00:00
Vinit Deshpande
c3eb155644
Fix WPS docs for LABEL method
...
Since we don't support LABEL method in startWps, document
it explicitly.
Bug: 18298388
Change-Id: I5d4c2475a68f1b41e5fc449c911b7b01b3b82fc4
2014-11-18 11:07:58 -08:00
Wink Saville
8ffeda02d7
Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflict
...
Conflicts:
wifi/java/android/net/wifi/WifiConfiguration.java
Change-Id: If52be614cadf80955025097589f922072363e7ba
2014-11-12 08:24:40 -08:00
vandwalle
4d974fa942
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
2014-11-12 03:23:35 +00:00
vandwalle
ec3e9805dd
dont blacklist wifi config that have had validated internet status in the past
...
Change-Id: Iadb4e0e1beeb9e582b944e003470815a5a865652
2014-11-10 14:27:20 -08:00
Jeff Davidson
e40ea96f97
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().
2014-11-06 00:12:44 +00:00
Jeff Davidson
a45e98974e
am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev
...
* commit '8cae7f644c59f0200f1962abdfbc6001166a192c':
Fix incorrect doc for WifiInfo#getSSID().
2014-11-05 23:19:44 +00:00
Jeff Davidson
f92fc1ca65
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
2014-11-05 10:26:00 -08:00