git.osdn.net Git - android-x86/hardware-libhardware

Etan Cohen [Thu, 22 Dec 2016 18:27:56 +0000 (18:27 +0000)]

Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am: 6d26bb0360 am: c61d69fba8
am: f23cd51227

Change-Id: Ia8b8cc8760485a250ba32d55dd6b1f17b0673c90

commit | commitdiff | tree

Etan Cohen [Thu, 22 Dec 2016 18:23:27 +0000 (18:23 +0000)]

Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am: 6d26bb0360
am: c61d69fba8

Change-Id: I1de5ccbd20d333a5c5f53930a61d4e607419b515

commit | commitdiff | tree

Etan Cohen [Thu, 22 Dec 2016 18:17:38 +0000 (18:17 +0000)]

Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication"
am: 6d26bb0360

Change-Id: Idf973a47c0156190690dd763115097f8308107ed

commit | commitdiff | tree

Etan Cohen [Thu, 22 Dec 2016 18:01:00 +0000 (18:01 +0000)]

Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication"

commit | commitdiff | tree

Subhani Shaik [Wed, 7 Dec 2016 23:21:22 +0000 (15:21 -0800)]

[AWARE]: Enable ranging in Publish/Subscribe/Indication

Bug: 33821639
Test: unit + integration (sl4a) tests passing
Change-Id: I5aa9f39527a5296fa6a361a459b574521c774591

commit | commitdiff | tree

Randy Pan [Tue, 13 Dec 2016 19:51:31 +0000 (19:51 +0000)]

Merge "Roaming Enhancement API" am: ab920d2460 am: 9fc8d06e2f -s ours am: 45420947af -s ours
am: 1561cf04e3 -s ours

Change-Id: I0f19629e2745bcc356374f6394ae339a307e27c4

commit | commitdiff | tree

Randy Pan [Tue, 13 Dec 2016 19:44:59 +0000 (19:44 +0000)]

Merge "Roaming Enhancement API" am: ab920d2460 am: 9fc8d06e2f -s ours
am: 45420947af -s ours

Change-Id: Ib89b7dcacb39920d204a9eeb91a5e629ad63c79e

commit | commitdiff | tree

Randy Pan [Tue, 13 Dec 2016 19:38:54 +0000 (19:38 +0000)]

Merge "Roaming Enhancement API" am: ab920d2460
am: 9fc8d06e2f -s ours

Change-Id: I9b09c131addc442d037b7e6656af657252858496

commit | commitdiff | tree

Randy Pan [Tue, 13 Dec 2016 19:31:59 +0000 (19:31 +0000)]

Merge "Roaming Enhancement API"
am: ab920d2460

Change-Id: Ic45f3678794eee98570e9cb29d64e672d4a22669

commit | commitdiff | tree

Randy Pan [Tue, 13 Dec 2016 19:25:40 +0000 (19:25 +0000)]

Merge "Roaming Enhancement API"

commit | commitdiff | tree

Randy Pan [Tue, 13 Dec 2016 17:29:50 +0000 (17:29 +0000)]

Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp am: bfb1de0e57 -s ours
am: 43f3346e8a -s ours

Change-Id: I9232087828d3ff29dcec71126503f1fb9f14380b

commit | commitdiff | tree

Randy Pan [Tue, 13 Dec 2016 17:27:56 +0000 (17:27 +0000)]

Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp
am: bfb1de0e57 -s ours

Change-Id: I4219fc81a2fab8f61fa4f9a6591ab84e4aef6644

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 17:26:54 +0000 (17:26 +0000)]

Roaming Enhancement API am: 75814ce428
am: 26c1560d5d -s ours

Change-Id: I93aa05518c1a6fcbdb8543cd6e0aee4b150cc103

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 17:20:31 +0000 (17:20 +0000)]

Roaming Enhancement API
am: 75814ce428

Change-Id: I5ad4a09f94dcf2e6946af89ce09a75c2679fc560

commit | commitdiff | tree

Randy Pan [Tue, 13 Dec 2016 17:16:21 +0000 (17:16 +0000)]

Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Etan Cohen [Tue, 13 Dec 2016 15:27:22 +0000 (15:27 +0000)]

Merge changes from topic 'aware_hal_updates' am: 33b3f09576 am: 1d8b72d050 am: 02701653c0
am: 6be9c31c02

Change-Id: Id9d73e7a15516ae3d52066827977a0f8caf69c10

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:27:20 +0000 (15:27 +0000)]

[AWARE]: Enable Service Descriptor Extension Attribute am: 0001cdb414 am: 45559af039 am: 3a748b3221
am: 2e77e1e170

Change-Id: Ic200a2751f678a1f1abf51ccf73346627446fab3

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:27:18 +0000 (15:27 +0000)]

[AWARE]: Enable Discovery MAC addr randomization am: f032356db0 am: 53fe3f6c9c am: 544b92baff
am: 14e005b63a

Change-Id: I61a2a42afea61efbc083a6ea8ad2ce6a08875669

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:27:16 +0000 (15:27 +0000)]

[AWARE]: Enable NAN Security am: 548fbb3ab5 am: 6968799354 am: 5a18f78015
am: 8c6dab11a0

Change-Id: I2a66aaddd67dc0cbc2b876121185f2d153f587ea

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:27:14 +0000 (15:27 +0000)]

[AWARE] Config/Publish/Subscribe DW interval config am: 79e0e1be8c am: 8ee3b96dd1 am: 34433346df
am: 6cb2dfea1e

Change-Id: I9d07420ec866339a558870ca9b32850e9983d751

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:27:12 +0000 (15:27 +0000)]

[AWARE]: Include ndp operating channel in Sync stats am: 2383b51f66 am: ab84238365 am: 472872412e
am: a246448faa

Change-Id: Ia50395f75dfe93a9f871b414aff57fdf8b0fda37

commit | commitdiff | tree

Etan Cohen [Tue, 13 Dec 2016 15:20:50 +0000 (15:20 +0000)]

Merge changes from topic 'aware_hal_updates' am: 33b3f09576 am: 1d8b72d050
am: 02701653c0

Change-Id: Ia8bdeac8ed4166c83317d0f255932483035ef4ee

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:20:48 +0000 (15:20 +0000)]

[AWARE]: Enable Service Descriptor Extension Attribute am: 0001cdb414 am: 45559af039
am: 3a748b3221

Change-Id: I72f53f347acfe9dd6225f78b586a66b00b4e0ca8

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:20:46 +0000 (15:20 +0000)]

[AWARE]: Enable Discovery MAC addr randomization am: f032356db0 am: 53fe3f6c9c
am: 544b92baff

Change-Id: I298267353af01e2f962951cdc5104f259ae1996c

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:20:44 +0000 (15:20 +0000)]

[AWARE]: Enable NAN Security am: 548fbb3ab5 am: 6968799354
am: 5a18f78015

Change-Id: I6186abb54eb2d5cfe52af5c571b7dfc2f26216e6

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:20:42 +0000 (15:20 +0000)]

[AWARE] Config/Publish/Subscribe DW interval config am: 79e0e1be8c am: 8ee3b96dd1
am: 34433346df

Change-Id: I5e3266114000fdf8aa938e0cfac8c76a6847487f

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:20:40 +0000 (15:20 +0000)]

[AWARE]: Include ndp operating channel in Sync stats am: 2383b51f66 am: ab84238365
am: 472872412e

Change-Id: I6181ec7283967d708ddb2c1b048a95edf0b59ebb

commit | commitdiff | tree

Etan Cohen [Tue, 13 Dec 2016 15:13:49 +0000 (15:13 +0000)]

Merge changes from topic 'aware_hal_updates' am: 33b3f09576
am: 1d8b72d050

Change-Id: Icaf27482b02f03505166036d3b058d566e1c3e4d

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:13:47 +0000 (15:13 +0000)]

[AWARE]: Enable Service Descriptor Extension Attribute am: 0001cdb414
am: 45559af039

Change-Id: I1c270e165424a94e07125a895c7d09b9f57a7cb0

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:13:46 +0000 (15:13 +0000)]

[AWARE]: Enable Discovery MAC addr randomization am: f032356db0
am: 53fe3f6c9c

Change-Id: Ie8acccea12b10efc481048e67885d2b953b0f5ef

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:13:44 +0000 (15:13 +0000)]

[AWARE]: Enable NAN Security am: 548fbb3ab5
am: 6968799354

Change-Id: I6606803b630079150da0812e5c1f813a97e3f51f

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:13:42 +0000 (15:13 +0000)]

[AWARE] Config/Publish/Subscribe DW interval config am: 79e0e1be8c
am: 8ee3b96dd1

Change-Id: I08e89131a7cdbcabd3f76d09f7b179a42fd540c3

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:13:40 +0000 (15:13 +0000)]

[AWARE]: Include ndp operating channel in Sync stats am: 2383b51f66
am: ab84238365

Change-Id: Icebb18eb1e7b0b3b9b2b7a68907600530bca678d

commit | commitdiff | tree

Etan Cohen [Tue, 13 Dec 2016 15:06:55 +0000 (15:06 +0000)]

Merge changes from topic 'aware_hal_updates'
am: 33b3f09576

Change-Id: If263cb4f845c3aa1e64a9a07336e081315a28af4

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:06:47 +0000 (15:06 +0000)]

[AWARE]: Enable Service Descriptor Extension Attribute
am: 0001cdb414

Change-Id: I2bd71eb03eb204805f4be4f5a225b1a7a74804c0

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:06:45 +0000 (15:06 +0000)]

[AWARE]: Enable Discovery MAC addr randomization
am: f032356db0

Change-Id: Icaab72c73cae4b4579a93d7f90c0a006a16dc1bb

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:06:44 +0000 (15:06 +0000)]

[AWARE]: Enable NAN Security
am: 548fbb3ab5

Change-Id: I0e974dd5d77ac52271071c09cf294e58562783ce

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:06:42 +0000 (15:06 +0000)]

[AWARE] Config/Publish/Subscribe DW interval config
am: 79e0e1be8c

Change-Id: Id99fc1792e12e2925a12cf87665ab9a8bb0208c7

commit | commitdiff | tree

Subhani Shaik [Tue, 13 Dec 2016 15:06:40 +0000 (15:06 +0000)]

[AWARE]: Include ndp operating channel in Sync stats
am: 2383b51f66

Change-Id: I3c4ed640cd53cff0c25d8b4142567bd02e3e5940

commit | commitdiff | tree

Etan Cohen [Tue, 13 Dec 2016 15:01:55 +0000 (15:01 +0000)]

Merge changes from topic 'aware_hal_updates'

* changes:
  [AWARE]: Enable Service Descriptor Extension Attribute
  [AWARE]: Enable Discovery MAC addr randomization
  [AWARE]: Enable NAN Security
  [AWARE] Config/Publish/Subscribe DW interval config
  [AWARE]: Include ndp operating channel in Sync stats

commit | commitdiff | tree

Subhani Shaik [Tue, 4 Oct 2016 14:10:38 +0000 (19:40 +0530)]

Roaming Enhancement API

Roaming enhancements to avoid critical sections between
firmware based network selection and framework based network
selection. Also remove blacklist_bssid changes from gscan.h
to avoid duplication.

BUG: 32883971
Test: Build.
Change-Id: I4c851e9c1969123427f2a92e729b9a5b6fd5b8d8
Merged-In: I4c851e9c1969123427f2a92e729b9a5b6fd5b8d8

commit | commitdiff | tree

Subhani Shaik [Wed, 7 Dec 2016 00:15:06 +0000 (16:15 -0800)]

[AWARE]: Enable Service Descriptor Extension Attribute

Bug: 33554197
Test: builds
Change-Id: I22e442391776d86aa69e888fade4f03ca4002cbe

commit | commitdiff | tree

Subhani Shaik [Tue, 4 Oct 2016 14:10:38 +0000 (19:40 +0530)]

commit | commitdiff | tree

Subhani Shaik [Fri, 28 Oct 2016 06:08:20 +0000 (23:08 -0700)]

[AWARE]: Enable Discovery MAC addr randomization

By default discovery MAC address randomization is enabled
and default(maximum) interval value is 30 minutes(1800 seconds).
Nan enable and config can specify the interval value in seconds.
Value of zero disables discovery MAC address randomization.

Bug: 33386762
Test: builds
Change-Id: I5dc10db8535227575f96635604665b6f52f8d507

commit | commitdiff | tree

Subhani Shaik [Tue, 8 Nov 2016 01:22:41 +0000 (17:22 -0800)]

[AWARE]: Enable NAN Security

1) Include security params in Publish/Subscribe/Data Request/Response
Structures.
2) Include security params in MatchIndication.

Bug: 33552694
Test: builds
Change-Id: I7a3af05b17f18040b311cf861c8dc0a0bba99d7d

commit | commitdiff | tree

Subhani Shaik [Thu, 3 Nov 2016 17:08:48 +0000 (10:08 -0700)]

[AWARE] Config/Publish/Subscribe DW interval config

As part of the Power save enhancements:
1) The device level DW intervals to be configured through config API.
2) Awake DW intervals for publish and subscribe(period parameter)
can be configured using the interval values 1, 2, 4, 8, 16.

Bug: 33552536
Test: builds
Change-Id: I3177ba13c861275a5860b825d3c466e0643bcec1

commit | commitdiff | tree

Randy Pan [Mon, 12 Dec 2016 21:16:21 +0000 (21:16 +0000)]

Merge "Roaming Enhancement API"

commit | commitdiff | tree

Subhani Shaik [Mon, 12 Dec 2016 19:59:14 +0000 (11:59 -0800)]

[AWARE]: Include ndp operating channel in Sync stats

Change-Id: I8bf99a669b9ab52a85100e8e8e3228bb71cf4d04

commit | commitdiff | tree

Etan Cohen [Wed, 30 Nov 2016 17:34:23 +0000 (17:34 +0000)]

Merge "[AWARE] Configure Service Auto/None response in firmware" am: 684b87fb88 am: fe7e0f99b9 am: 57e803839c
am: f3030f22f3

Change-Id: I788af2ec72c6f5df2fe65c17363aeb65fd72a1f1

commit | commitdiff | tree

Etan Cohen [Wed, 30 Nov 2016 17:27:29 +0000 (17:27 +0000)]

Merge "[AWARE] Configure Service Auto/None response in firmware" am: 684b87fb88 am: fe7e0f99b9
am: 57e803839c

Change-Id: Ibd082c29e4548585d1aaa4d45aef39271dbc0560

commit | commitdiff | tree

Etan Cohen [Wed, 30 Nov 2016 17:17:39 +0000 (17:17 +0000)]

Merge "[AWARE] Configure Service Auto/None response in firmware" am: 684b87fb88
am: fe7e0f99b9

Change-Id: Ifa23a032f13dddd5e6151e4abd1bcaf7fa712a99

commit | commitdiff | tree

Etan Cohen [Wed, 30 Nov 2016 17:11:19 +0000 (17:11 +0000)]

Merge "[AWARE] Configure Service Auto/None response in firmware"
am: 684b87fb88

Change-Id: Ie9734b64f262f1186e67a7e9a74a03c938eab642

commit | commitdiff | tree

Etan Cohen [Wed, 30 Nov 2016 17:02:11 +0000 (17:02 +0000)]

Merge "[AWARE] Configure Service Auto/None response in firmware"

commit | commitdiff | tree

Subhani Shaik [Thu, 3 Nov 2016 16:35:26 +0000 (09:35 -0700)]

[AWARE] Configure Service Auto/None response in firmware

Configure the Service Non Auto responder mode.
Accept all subscribes is the default firmware behavior.
If Non Auto response is configured in the Publish API,
firmware notifies the framework and expects a response
from the Publisher.

Bug: 33209958
Test: integration data-path (sl4a) tests passing
Change-Id: I78f096d0d046f3bd39421269c79b9012a3a3cc0e

commit | commitdiff | tree

Eric Laurent [Tue, 29 Nov 2016 01:47:43 +0000 (17:47 -0800)]

remove legacy audio policy

Test: make.

Change-Id: I8b04ba9e1ab3b3fc22cf1b1baba010664c47ecc6

commit | commitdiff | tree

Subhani Shaik [Tue, 4 Oct 2016 14:10:38 +0000 (19:40 +0530)]

commit | commitdiff | tree

Etan Cohen [Tue, 15 Nov 2016 17:48:48 +0000 (17:48 +0000)]

Merge "Add description to NAN API/error codes" am: 815654a3d8 am: 88596972ee am: 3872714e8d
am: 8a4a81a1b4

Change-Id: I4a438a246d15cc40296f246eb8f088a7c63b1a20

commit | commitdiff | tree

Etan Cohen [Tue, 15 Nov 2016 17:40:14 +0000 (17:40 +0000)]

Merge "Add description to NAN API/error codes" am: 815654a3d8 am: 88596972ee
am: 3872714e8d

Change-Id: Ie80455b404390a30a01a7576d9baefeea5aa2915

commit | commitdiff | tree

Etan Cohen [Tue, 15 Nov 2016 17:32:41 +0000 (17:32 +0000)]

Merge "Add description to NAN API/error codes" am: 815654a3d8
am: 88596972ee

Change-Id: Iaf1264090cb4f54d8c1ae7034bb59e3fd20f6b9c

commit | commitdiff | tree

Etan Cohen [Tue, 15 Nov 2016 17:25:36 +0000 (17:25 +0000)]

Merge "Add description to NAN API/error codes"
am: 815654a3d8

Change-Id: Id111bff19ee94a365d5d6fb777e8dbe8b867e092

commit | commitdiff | tree

Etan Cohen [Tue, 15 Nov 2016 17:20:21 +0000 (17:20 +0000)]

Merge "Add description to NAN API/error codes"

commit | commitdiff | tree

Subhani Shaik [Fri, 29 Jul 2016 00:32:36 +0000 (17:32 -0700)]

Add description to NAN API/error codes

(cherry-pick of commit de91d3f9fe307f0f49acc2650e221bd6b9b698f7)
(cherry-pick of commit af855190314fe919cc4436e402d727c4b6191aa2)

BUG: 27914592
Change-Id: I7d63472c5c9872817e9535e55c8b8c04c5b7c4e2

commit | commitdiff | tree

Marco Nelissen [Tue, 1 Nov 2016 23:07:56 +0000 (16:07 -0700)]

libhardware_legacy doesn't need libmedia

Test: build/boot
Change-Id: I3fefb13c0f7a80c2d051271cd0f2a42a1ebf504d

commit | commitdiff | tree

Christopher Wiley [Mon, 12 Sep 2016 18:26:02 +0000 (18:26 +0000)]

Merge "Use libbase logging in libwifi-hal-common" am: fa89e62cec am: 4debb7cb99 am: 5f482c156e
am: 785955a49f

Change-Id: I2fcdaafb72ae27c4cc5dc09e9be684f42bab43e1

commit | commitdiff | tree

Christopher Wiley [Mon, 12 Sep 2016 18:05:37 +0000 (18:05 +0000)]

Merge "Use libbase logging in libwifi-hal-common" am: fa89e62cec am: 4debb7cb99
am: 5f482c156e

Change-Id: I51acc914fc846c3ee2912ca1e2ad5a4bb19f0f8f

commit | commitdiff | tree

Christopher Wiley [Mon, 12 Sep 2016 18:02:07 +0000 (18:02 +0000)]

Merge "Use libbase logging in libwifi-hal-common" am: fa89e62cec
am: 4debb7cb99

Change-Id: I03186c0e350293afcc76369681e777538bc7ccba

commit | commitdiff | tree

Christopher Wiley [Mon, 12 Sep 2016 17:58:43 +0000 (17:58 +0000)]

Merge "Use libbase logging in libwifi-hal-common"
am: fa89e62cec

Change-Id: Ic042cf695cbfeb6a14f7ac3f9456e1d7c05ec163

commit | commitdiff | tree

Christopher Wiley [Mon, 12 Sep 2016 17:52:45 +0000 (17:52 +0000)]

Merge "Use libbase logging in libwifi-hal-common"

commit | commitdiff | tree

Christopher Wiley [Fri, 9 Sep 2016 20:53:56 +0000 (13:53 -0700)]

Use libbase logging in libwifi-hal-common

This allows log messages to appear under the global tag of the
process using the code, rather than per file log tags.

Bug: 31398942
Test: Compiles for bullhead
Change-Id: I1a17dfb1e758d22ec76295d85194c85dd2cf4ed3

commit | commitdiff | tree

Mitchell Wills [Thu, 1 Sep 2016 20:19:21 +0000 (20:19 +0000)]

Merge "Remove build wifi dependencies for brillo" am: 24c133dccd am: 6b4c8d68ac am: 91810f2385
am: 10c5349097

Change-Id: I5bacf90353fba3b371e0172d852a6a2f770d0548

commit | commitdiff | tree

Mitchell Wills [Thu, 1 Sep 2016 20:16:16 +0000 (20:16 +0000)]

Merge "Remove build wifi dependencies for brillo" am: 24c133dccd am: 6b4c8d68ac
am: 91810f2385

Change-Id: I2df3769d88050e8e1dba881fb2d52c44206e9406

commit | commitdiff | tree

Mitchell Wills [Thu, 1 Sep 2016 20:13:16 +0000 (20:13 +0000)]

Merge "Remove build wifi dependencies for brillo" am: 24c133dccd
am: 6b4c8d68ac

Change-Id: Icc6102f22212517a0d41e950d5361e200474ce32

commit | commitdiff | tree

Mitchell Wills [Thu, 1 Sep 2016 20:09:51 +0000 (20:09 +0000)]

Merge "Remove build wifi dependencies for brillo"
am: 24c133dccd

Change-Id: I2ad0b2f7496e707cbcbec096172b01a8917f7258

commit | commitdiff | tree

Treehugger Robot [Thu, 1 Sep 2016 20:03:19 +0000 (20:03 +0000)]

Merge "Remove build wifi dependencies for brillo"

commit | commitdiff | tree

Mitchell Wills [Thu, 1 Sep 2016 17:09:54 +0000 (10:09 -0700)]

Remove build wifi dependencies for brillo

Change-Id: I742225571d2c3156ef0b5be5f296b1cba0ee9c90

commit | commitdiff | tree

Amarnath Hullur Subramanyam [Tue, 30 Aug 2016 04:46:33 +0000 (04:46 +0000)]

Merge branch 'stage-aosp-master' into nyc-dev-plus-aosp am: f2e485fd79
am: 6550efb63e

Change-Id: Ice909127c4f6e548aebd056bb2cfb310ea68e3c6

commit | commitdiff | tree

Amarnath Hullur Subramanyam [Mon, 29 Aug 2016 23:22:20 +0000 (23:22 +0000)]

Merge branch 'stage-aosp-master' into nyc-dev-plus-aosp
am: f2e485fd79

Change-Id: I073a57063e6a59a07f200949539b1d12b2488cd3

commit | commitdiff | tree

The Android Automerger [Mon, 29 Aug 2016 23:07:59 +0000 (23:07 +0000)]

Merge branch 'stage-aosp-master' into nyc-dev-plus-aosp

commit | commitdiff | tree

Amarnath Hullur Subramanyam [Wed, 24 Aug 2016 20:11:56 +0000 (20:11 +0000)]

Wifi: Corrected NanSRFState enum type
am: 523a38f9c4

Change-Id: I57dc1df39897572634df50f259fa01f646333dc0

commit | commitdiff | tree

Amarnath Hullur Subramanyam [Tue, 23 Aug 2016 22:53:48 +0000 (15:53 -0700)]

Wifi: Corrected NanSRFState enum type

The NanSRFState enum was incorrectly specifying NAN_DO_NOT_USE_SRF
as 1 which was not insync with the wifi firmware expected value
causing the case of active subscribe and solicited publish to fail.
This commit updates the enum type appropriately.

Bug: 30898004
Change-Id: I89f092964daeeb962b57ea474131bb58984a4d43

commit | commitdiff | tree

Subhani Shaik [Thu, 28 Jul 2016 17:03:27 +0000 (17:03 +0000)]

[NAN] Add msg to indicate transmit followup queue is full
am: 720544bb0d

Change-Id: I84bdfabc389f41c249c5f9a9b48c489021134433

commit | commitdiff | tree

Subhani Shaik [Tue, 26 Jul 2016 23:40:50 +0000 (16:40 -0700)]

[NAN] Add msg to indicate transmit followup queue is full

BUG: 29642700
Change-Id: I84ae1ec945c8795edad0dee2b0c575f3f633f6db

commit | commitdiff | tree

TreeHugger Robot [Fri, 1 Jul 2016 02:27:16 +0000 (02:27 +0000)]

Merge "Include common wifi HAL functionality"

commit | commitdiff | tree

Christopher Wiley [Thu, 30 Jun 2016 22:30:07 +0000 (15:30 -0700)]

Include common wifi HAL functionality

Unfortunately, the LOWI server links against this library and hopes to
find this functionality.

Test: Scanning works on bullhead again
Bug: 29913356

Change-Id: Icb7c27df399d7fcb25aff88a57da78219881a25e

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 30 Jun 2016 22:35:57 +0000 (22:35 +0000)]

Merge \\\\"Fix google-explicit-constructor warnings in libhardware_legacy\\\\" am: a7355c3ab4 am: d0273aaaab am: c9cadd7944
am: 9dca3a3c75

Change-Id: I7dfe40cc965740ba695943cba6c342d7ec8fc100

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 30 Jun 2016 22:32:08 +0000 (22:32 +0000)]

Merge \\\"Fix google-explicit-constructor warnings in libhardware_legacy\\\" am: a7355c3ab4 am: d0273aaaab
am: c9cadd7944

Change-Id: I79049fe097f09490dc637bb87d568f89ee0e10eb

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 30 Jun 2016 22:28:21 +0000 (22:28 +0000)]

Merge \\"Fix google-explicit-constructor warnings in libhardware_legacy\\" am: a7355c3ab4
am: d0273aaaab

Change-Id: Ifc99dc49c080eeadc7e4634b1cfe6bf6bde32c78

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 30 Jun 2016 22:24:38 +0000 (22:24 +0000)]

Merge \"Fix google-explicit-constructor warnings in libhardware_legacy\"
am: a7355c3ab4

Change-Id: I0f4c805e27c1e51d15f63d7e6b9c0521fd9bd520

commit | commitdiff | tree

Treehugger Robot [Thu, 30 Jun 2016 22:16:22 +0000 (22:16 +0000)]

Merge "Fix google-explicit-constructor warnings in libhardware_legacy"

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 30 Jun 2016 21:19:12 +0000 (14:19 -0700)]

Fix google-explicit-constructor warnings in libhardware_legacy

Bug: 28341362
Change-Id: I9b370ece9506591abfff46d5edb726a7fc993298
Test: build with clang-tidy

commit | commitdiff | tree

Chih-hung Hsieh [Tue, 28 Jun 2016 18:42:00 +0000 (18:42 +0000)]

resolve merge conflicts of b3a0cc6 to stage-aosp-master am: 3fd32ebb0c am: 51c912c856
am: 7110b4bccf

Change-Id: I5267b963aa81c8f1cd9ea0e0d1a7e1b599557507

commit | commitdiff | tree

Chih-Hung Hsieh [Tue, 28 Jun 2016 18:36:12 +0000 (18:36 +0000)]

resolve merge conflicts of b3a0cc6 to stage-aosp-master am: 3fd32ebb0c
am: 51c912c856

Change-Id: I4fb4e40baed73b1047ff4806674327fc8f1afdff

commit | commitdiff | tree

Chih-hung Hsieh [Tue, 28 Jun 2016 18:33:20 +0000 (18:33 +0000)]

resolve merge conflicts of b3a0cc6 to stage-aosp-master
am: 3fd32ebb0c

Change-Id: I77b01a8a101fada2ea821265d36639970c29cc6f

commit | commitdiff | tree

Chih-Hung Hsieh [Tue, 28 Jun 2016 17:40:51 +0000 (10:40 -0700)]

resolve merge conflicts of b3a0cc6 to stage-aosp-master

Change-Id: Ia40cd728f1d352d9a6611718dda8850afe3dfa63

commit | commitdiff | tree

Chih-hung Hsieh [Mon, 27 Jun 2016 23:34:11 +0000 (23:34 +0000)]

Merge "Fix misc-macro-parentheses warnings in hardware_legacy."

commit | commitdiff | tree

David 'Digit' Turner [Wed, 22 Jun 2016 08:29:46 +0000 (10:29 +0200)]

resolve merge conflicts of 21cfbd1 to master

Change-Id: Ic2520bcd2ae516d0d6e8f724b11a0f39ccd64177

commit | commitdiff | tree

David 'Digit' Turner [Wed, 22 Jun 2016 08:17:52 +0000 (08:17 +0000)]

Merge \\\"Remove qemu dependency.\\\" am: 146d8ade97 am: 1d07c27cf6
am: 1559243734

Change-Id: I16e98e96d375e369b2918821965478b57790711e

commit | commitdiff | tree

David Turner [Wed, 22 Jun 2016 08:15:11 +0000 (08:15 +0000)]

Merge \\"Remove qemu dependency.\\" am: 146d8ade97
am: 1d07c27cf6

Change-Id: Ie4ceb27e8089f9b22269373fc0d44056ecab47ef

commit | commitdiff | tree

David 'Digit' Turner [Wed, 22 Jun 2016 08:12:34 +0000 (08:12 +0000)]

Merge \"Remove qemu dependency.\"
am: 146d8ade97

Change-Id: I77429a76555d35e95ed841c685b9783e5eb9c730

commit | commitdiff | tree

David Turner [Wed, 22 Jun 2016 08:10:07 +0000 (08:10 +0000)]