634 Commits

Author SHA1 Message Date
Irfan Sheriff
526603b1d8 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.
2013-01-24 16:15:29 -08:00
Yoshihiko Ikenaga
1201dd9b70 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>
2013-01-24 13:48:58 +09:00
Irfan Sheriff
b3608ad877 Merge "eix enterprise config storage bugs" 2013-01-19 18:16:18 +00:00
Irfan Sheriff
e095675c87 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
2013-01-19 09:53:46 -08:00
Irfan Sheriff
8217635056 Merge "Fix build" 2013-01-15 10:13:53 -08:00
Irfan Sheriff
86ee9640ee Fix build
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
2013-01-15 10:11:27 -08:00
Irfan Sheriff
92325abb2c Merge "Refactor enterprise config" 2013-01-15 09:02:59 -08:00
Irfan Sheriff
9b81319002 Refactor enterprise config
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
2013-01-15 08:57:26 -08:00
Wink Saville
aa621bf26f Use readUnsignedByte.
To remove any doubt about how java is doing its byte/integer arithmetic
use readUnsignedByte instead of readByte.

Change-Id: I5bdc200ed0cda51ad739804ac1d8d13c043424ec
2013-01-09 10:53:51 -08:00
Irfan Sheriff
f118043ca7 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
2012-12-14 14:48:10 -08:00
Irfan Sheriff
3a67e2515b Expose more details in broadcasts
Expose details in broadcasts and do the necessary clean up alongside

Change-Id: I9011d51675a233aa3542f097c8a489c2095103b1
2012-12-11 22:00:14 -08:00
Irfan Sheriff
42b1b564b6 Merge "Remove exposing dialog handling to apps" 2012-12-06 13:31:36 -08:00
Irfan Sheriff
88b41a589d am 46e38079: am c602187e: Merge "Prevent scanning during DHCP process"
* commit '46e380795216c58acbd38af532ac1626e105866a':
  Prevent scanning during DHCP process
2012-12-06 10:44:03 -08:00
Irfan Sheriff
ef96a43a3c 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
2012-12-05 21:19:52 -08:00
Irfan Sheriff
c602187e51 Merge "Prevent scanning during DHCP process" 2012-12-05 09:25:43 -08:00
Irfan Sheriff
a5c6166c95 am 9648a484: am cdd03f54: Merge "Try go-negotiation when invocation request is deferred."
* commit '9648a484e0f5e0d90c76e83b2ec6a12dec1e3d83':
  Try go-negotiation when invocation request is deferred.
2012-12-03 12:41:38 -08:00
Irfan Sheriff
cdd03f5487 Merge "Try go-negotiation when invocation request is deferred." 2012-12-03 11:59:53 -08:00
Vitaly Wool
d7fc38cead 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
2012-12-03 16:00:44 +01:00
Irfan Sheriff
8575c6637f Merge "Cleanup logging" 2012-11-30 15:59:34 -08:00
Irfan Sheriff
f0afe4144d Cleanup logging
Change-Id: Ieea19853c069266b55cad80cce3743b5ba91218a
2012-11-30 15:58:46 -08:00
Irfan Sheriff
38ddedc8ad Merge "Support for dumping transition only messages" 2012-11-30 09:41:51 -08:00
Irfan Sheriff
ef8da9fe0b Support for dumping transition only messages
Change-Id: I4968e28334f9dd49bd8fb81d04b25d62ca6da300
2012-11-30 08:13:27 -08:00
Yoshihiko Ikenaga
9348005545 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>
2012-11-28 09:52:06 +09:00
Irfan Sheriff
b637322fd0 am a80b9954: am 10c29234: am 13fd8919: Merge "Fixed typo and space."
* commit 'a80b9954a4e68700030e0c1718a82f3433074037':
  Fixed typo and space.
2012-11-27 11:27:25 -08:00
Robert Greenwalt
8058f62189 Support for dns domain.
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
2012-11-16 11:25:32 -08:00
Yoshihiko Ikenaga
7d9cf119d1 Fixed typo and space.
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-11-16 16:59:36 +09:00
Robert Greenwalt
321020b7e0 Merge "Remove DhcpInfoInternal" 2012-11-09 09:51:21 -08:00
Robert Greenwalt
4717c261b2 Remove DhcpInfoInternal
First step in accepting a set of patches.
bug:6799630

Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
2012-11-09 09:46:32 -08:00
Irfan Sheriff
5c8e5585e2 am 1f6cf5fa: Merge "Re-use existing thread" into jb-mr1.1-dev
* commit '1f6cf5fade6021c1ce788541ec4a60ee36d20651':
  Re-use existing thread
2012-11-07 16:46:31 -08:00
Irfan Sheriff
cd3d75f35d Re-use existing thread
Bug: 7377541
Change-Id: I097f2288ebfc2b4a9782cbced19d9c36d0703acb
2012-11-07 13:02:08 -08:00
Irfan Sheriff
f264e8e34e am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
  Stop supplicant and dhcp before start
2012-11-06 17:43:05 -08:00
Irfan Sheriff
511d5346ce Stop supplicant and dhcp before start
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
2012-11-06 15:53:32 -08:00
Irfan Sheriff
b20dae4a8d am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev
* commit '4bfa1e99e2ce5aa96465872a159377102a5bb4cb':
  Fix handling escaped chars in ssid
2012-10-29 14:12:19 -07:00
Irfan Sheriff
11de9e5537 Fix handling escaped chars in ssid
Bug: 7427185
Change-Id: Ie669dff01af0865ea50305f3b48cf3f7af92cf6f
2012-10-29 10:01:38 -07:00
Irfan Sheriff
88d254cffb 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
2012-10-24 15:26:28 -07:00
Irfan Sheriff
2bc0c5fef2 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
2012-10-24 15:05:56 -07:00
Irfan Sheriff
9998f77a75 am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
* commit 'c48ca657f801b120e88c94287cdeecddc1a46e88':
  Fix driver stop handling
2012-10-23 10:49:14 -07:00
Irfan Sheriff
c48ca657f8 Merge "Fix driver stop handling" into jb-mr1-dev 2012-10-23 10:45:42 -07:00
Irfan Sheriff
e6464af000 Fix driver stop handling
Defer supplicant state change event so we do not miss it

Bug: 7394390
Change-Id: Ibae6cef6be42a6cb45dc20ba4fa5060d8e459217
2012-10-23 10:36:51 -07:00
Irfan Sheriff
5e7fcf372e am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev
* commit 'bf310d1f6ef4ac167f66a4e31724c7766981bd84':
  Fix issues shown on CTS tests
2012-10-23 09:39:42 -07:00
Irfan Sheriff
51aec5ed5f 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
2012-10-23 09:25:37 -07:00
Irfan Sheriff
cacc479207 am 61e42262: Fix group join CTS test
* commit '61e42262000549b78843f0959043fec8367ed189':
  Fix group join CTS test
2012-10-19 12:40:40 -07:00
Irfan Sheriff
61e4226200 Fix group join CTS test
Bug: 7379336
Change-Id: I20ead7e8c0d855be523bdfd8d9cb9eaa4b8fcac1
2012-10-19 12:30:47 -07:00
Justin Koh
75c61d83bf Merge "Add appliance mode handling for WiFi Direct invitation dialog." into jb-mr1-aah-dev 2012-10-19 10:13:35 -07:00
Justin Koh
8f38f3c8d5 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
2012-10-18 16:36:57 -07:00
Irfan Sheriff
62fa6de135 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
2012-10-18 13:35:57 -07:00
Irfan Sheriff
90a80bb8ae Merge "Handle null BSSID" into jb-mr1-dev 2012-10-17 12:48:39 -07:00
Irfan Sheriff
d4a149d9d0 Merge "Frequency conflict handling" into jb-mr1-dev 2012-10-17 11:52:14 -07:00
Irfan Sheriff
9f452d0b5c 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
2012-10-17 10:35:39 -07:00
Irfan Sheriff
edba852930 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
2012-10-16 18:10:38 -07:00