drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
184,473 Commits 1 Branch 0 Tags
Commit Graph

1051 Commits

Author SHA1 Message Date
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
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05: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
Jeff Davidson
bc2ccb48d3 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.
 2014-10-15 16:03:38 +00:00
Jeff Davidson
1199a4c436 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.
 2014-10-15 15:58:47 +00:00
Jeff Davidson
074c5b5b65 Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev 2014-10-15 15:49:26 +00:00
Primiano Tucci
0f422c6d80 resolved conflicts for merge of 28495b02 into master 
Conflicts:
    wifi/java/android/net/wifi/ScanResult.java

Change-Id: I86a4537d603cbf325e5e0bff715a442d9dc6b6db
 2014-10-08 12:22:29 +01:00
Primiano Tucci
73a648990f 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
 2014-10-08 12:20:12 +01:00
vandwalle
28495b02f2 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
 2014-10-08 07:51:57 +00:00
vandwalle
63edd98d2e adding debug information to bug report for Bug:16751877 
Change-Id: I9d417c20c6b6721933a4eb943c1305845005facf
 2014-10-07 14:38:38 -07:00
Jeff Davidson
8faf2a2a15 Don't drop WifiConfiguration's ephemeral bit on copy/parcel. 
Bug: 15892711
Change-Id: I4a027c99634a11d13bb3c8420ba959c201644689
 2014-10-06 16:29:35 -07:00
vandwalle
3041a9e07d 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
 2014-10-04 16:06:17 +00:00
vandwalle
542cc240b5 am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev 
* commit '88b927e258214a31342326d46f527528e5979f85':
  add millisecond timestamp to locallog
 2014-10-04 15:45:35 +00:00
vandwalle
c520aa89a3 add millisecond timestamp to locallog 
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
 2014-10-03 15:35:25 -07:00
Lorenzo Colitti
fb223e848f 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.
 2014-10-02 13:48:12 +00:00
Lorenzo Colitti
65d720b3fb 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.
 2014-10-02 13:40:24 +00:00
Lorenzo Colitti
8e1e34a3f6 Revert the configKey generation algorithm to what it was in K. 
Bug: 17670914
Change-Id: Ibb2ea26ea28a38518caab7d1b45ae535a0eaf661
 2014-09-30 18:30:58 +09:00
Sky Faber
c55cd10370 User wifi separation feature. 
Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
 2014-09-26 18:32:16 -07:00