OSDN Git Service

android-x86/hardware-libhardware_legacy.git
7 years agoMerge "[AWARE]: Add support to accept either passphrase or pmk" am: ad6f1d5512
Etan Cohen [Thu, 23 Mar 2017 00:29:04 +0000 (00:29 +0000)]
Merge "[AWARE]: Add support to accept either passphrase or pmk" am: ad6f1d5512
am: adedd72dd1

Change-Id: I8e7a62ca48e6925bf39157d5459ac0d46038a100

7 years agoMerge "[AWARE]: Add support to accept either passphrase or pmk"
Etan Cohen [Thu, 23 Mar 2017 00:26:27 +0000 (00:26 +0000)]
Merge "[AWARE]: Add support to accept either passphrase or pmk"
am: ad6f1d5512

Change-Id: I5b4df7e827e74747dde72b658b563ab62d356e10

7 years agoMerge "[AWARE]: Add support to accept either passphrase or pmk"
Etan Cohen [Thu, 23 Mar 2017 00:10:33 +0000 (00:10 +0000)]
Merge "[AWARE]: Add support to accept either passphrase or pmk"

7 years agoMerge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7
Etan Cohen [Tue, 21 Mar 2017 18:04:33 +0000 (18:04 +0000)]
Merge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7
am: 41fc794eff

Change-Id: I6320d1e6a82f26d3cc60a5c80c71e2ec17aa9ce7

7 years agoMerge "[AWARE]: Fix Nan capabilities mismatch"
Etan Cohen [Tue, 21 Mar 2017 18:01:03 +0000 (18:01 +0000)]
Merge "[AWARE]: Fix Nan capabilities mismatch"
am: 980baf1bd7

Change-Id: I01b2d62e40d25be61463ca93ea2153ce086a2be3

7 years agoMerge "[AWARE]: Fix Nan capabilities mismatch"
Etan Cohen [Tue, 21 Mar 2017 17:55:39 +0000 (17:55 +0000)]
Merge "[AWARE]: Fix Nan capabilities mismatch"

7 years ago[AWARE]: Fix Nan capabilities mismatch
Subhani Shaik [Thu, 16 Mar 2017 18:06:08 +0000 (11:06 -0700)]
[AWARE]: Fix Nan capabilities mismatch

Bug: 36357282

7 years ago[AWARE]: Add support to accept either passphrase or pmk
Subhani Shaik [Tue, 14 Mar 2017 00:38:10 +0000 (17:38 -0700)]
[AWARE]: Add support to accept either passphrase or pmk

Modify publish/subscribe/Data Initiator/Data Indication messages
to accept either PMK or Passphrase key information. Also, provide
a new parameter service name in Data Initiator request and
Data Indication response to generate PMK from passphrase and
service name for out of band requests.

Bug: 35866810
Test: TBD
Change-Id: Ibe572928e892bbd10be79dc2e09911ada348e89d

7 years agoMerge "[AWARE]: Add range report in SDEA params" am: 1da29541bc
Etan Cohen [Thu, 9 Mar 2017 23:21:31 +0000 (23:21 +0000)]
Merge "[AWARE]: Add range report in SDEA params" am: 1da29541bc
am: eaed213c02

Change-Id: Iee364e94f6a004a46d4d13e18be64bce4d39239c

7 years agoMerge "[AWARE]: Add range report in SDEA params"
Etan Cohen [Thu, 9 Mar 2017 23:18:30 +0000 (23:18 +0000)]
Merge "[AWARE]: Add range report in SDEA params"
am: 1da29541bc

Change-Id: I1b882862aa737f804098e99eebd6bd58c48fe895

7 years agoMerge "[AWARE]: Add range report in SDEA params"
Etan Cohen [Thu, 9 Mar 2017 23:13:29 +0000 (23:13 +0000)]
Merge "[AWARE]: Add range report in SDEA params"

7 years ago[AWARE]: Add range report in SDEA params
Subhani Shaik [Tue, 7 Mar 2017 04:02:43 +0000 (20:02 -0800)]
[AWARE]: Add range report in SDEA params

Bug: 36065933
Test: integration (sl4a) tests.
Change-Id: Ice8e87e2a6e4ed4475c7e6dcc691103071e0a03b

7 years agoMerge "Include get_iface_handle in header file" am: ea2adcc23a
Etan Cohen [Wed, 8 Mar 2017 18:00:33 +0000 (18:00 +0000)]
Merge "Include get_iface_handle in header file" am: ea2adcc23a
am: 9aaa236e05

Change-Id: I611245636817ecf2df8b57d26b2c3c6407fd3c35

7 years agoMerge "Include get_iface_handle in header file"
Etan Cohen [Wed, 8 Mar 2017 17:58:03 +0000 (17:58 +0000)]
Merge "Include get_iface_handle in header file"
am: ea2adcc23a

Change-Id: I8e03c907d0c77b83d0706de8d0326c286382b434

7 years agoMerge "Include get_iface_handle in header file"
Etan Cohen [Wed, 8 Mar 2017 17:53:06 +0000 (17:53 +0000)]
Merge "Include get_iface_handle in header file"

7 years agoInclude get_iface_handle in header file
Subhani Shaik [Wed, 1 Mar 2017 17:14:27 +0000 (09:14 -0800)]
Include get_iface_handle in header file

Bug: 35868267
Change-Id: I8f826fc15272b39686aea957f6407200cd62fac6

7 years agoMerge "[AWARE]: Fix documentation for Service responder policy" am: b82ef271aa
Etan Cohen [Fri, 24 Feb 2017 02:21:09 +0000 (02:21 +0000)]
Merge "[AWARE]: Fix documentation for Service responder policy" am: b82ef271aa
am: 8f1dad1734

Change-Id: I891b3cca3f384e8e7c78bccc26d798064ca641c4

7 years agoMerge "[AWARE]: Fix documentation for Service responder policy"
Etan Cohen [Fri, 24 Feb 2017 02:18:39 +0000 (02:18 +0000)]
Merge "[AWARE]: Fix documentation for Service responder policy"
am: b82ef271aa

Change-Id: I17b4b48391848b8a2580de339039b89d4257477f

7 years agoMerge "[AWARE]: Fix documentation for Service responder policy"
Etan Cohen [Fri, 24 Feb 2017 02:15:27 +0000 (02:15 +0000)]
Merge "[AWARE]: Fix documentation for Service responder policy"

7 years ago[AWARE]: Fix documentation for Service responder policy
Subhani Shaik [Fri, 24 Feb 2017 00:28:38 +0000 (16:28 -0800)]
[AWARE]: Fix documentation for Service responder policy

Bug: 35665140
Change-Id: I5fe10da87f76acd50e2704f14879eafc91363e2b

7 years agoMerge "[AWARE]: Enable SDEA based SSI" am: 83b034ea0f
Etan Cohen [Tue, 21 Feb 2017 22:52:05 +0000 (22:52 +0000)]
Merge "[AWARE]: Enable SDEA based SSI" am: 83b034ea0f
am: f9758f839e

Change-Id: Iaf1b625203e8f8844a9a420417322b11709b5428

7 years agoMerge "[AWARE]: Enable SDEA based SSI"
Etan Cohen [Tue, 21 Feb 2017 22:50:05 +0000 (22:50 +0000)]
Merge "[AWARE]: Enable SDEA based SSI"
am: 83b034ea0f

Change-Id: I35f133f43353f5e690d064672c58012b5c61ad4f

7 years agoMerge "[AWARE]: Enable SDEA based SSI"
Etan Cohen [Tue, 21 Feb 2017 22:47:25 +0000 (22:47 +0000)]
Merge "[AWARE]: Enable SDEA based SSI"

7 years ago[AWARE]: Enable SDEA based SSI
Subhani Shaik [Thu, 16 Feb 2017 06:42:23 +0000 (22:42 -0800)]
[AWARE]: Enable SDEA based SSI

Bug: 35193423
Test: integrated (sl4a) test
Change-Id: If29d93391071710bd419eeab6e384ca154da9c85

7 years agoMerge "[AWARE]: Configure ranging on discovery sessions" am: 427212dafe
Etan Cohen [Tue, 21 Feb 2017 17:59:22 +0000 (17:59 +0000)]
Merge "[AWARE]: Configure ranging on discovery sessions" am: 427212dafe
am: df1ea57d7c

Change-Id: Ief748551e9e811f440731707d37bbd29e3071901

7 years agoMerge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c
Etan Cohen [Tue, 21 Feb 2017 17:59:03 +0000 (17:59 +0000)]
Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c
am: f24303c6ec

Change-Id: Ic0f00c2987b47915300596569b0fcffaf20dcb08

7 years agoMerge "libhardware_legacy: remove dead code in Android.mk" am: 955b796f36
Colin Cross [Tue, 21 Feb 2017 17:58:56 +0000 (17:58 +0000)]
Merge "libhardware_legacy: remove dead code in Android.mk" am: 955b796f36
am: fa192e08eb

Change-Id: If745fb128e54f2c0563a71d53809a5112a937edd

7 years agoMerge "[AWARE]: Configure ranging on discovery sessions"
Etan Cohen [Tue, 21 Feb 2017 17:57:04 +0000 (17:57 +0000)]
Merge "[AWARE]: Configure ranging on discovery sessions"
am: 427212dafe

Change-Id: Iaca2afa6aea253cf61cc1aa0fa267f5b52cb04cf

7 years agoMerge "[NAN] Security configuration (cipher)"
Etan Cohen [Tue, 21 Feb 2017 17:56:44 +0000 (17:56 +0000)]
Merge "[NAN] Security configuration (cipher)"
am: 0f9dc48b2c

Change-Id: Id7ad1e6adee225bbc885ca23a973a04512858016

7 years agoMerge "libhardware_legacy: remove dead code in Android.mk"
Colin Cross [Tue, 21 Feb 2017 17:56:36 +0000 (17:56 +0000)]
Merge "libhardware_legacy: remove dead code in Android.mk"
am: 955b796f36

Change-Id: I621c976083a3ffb8128beb61f874bf3847382cbe

7 years agoMerge "[AWARE]: Configure ranging on discovery sessions"
Etan Cohen [Tue, 21 Feb 2017 16:32:19 +0000 (16:32 +0000)]
Merge "[AWARE]: Configure ranging on discovery sessions"

7 years agoMerge "[NAN] Security configuration (cipher)"
Etan Cohen [Tue, 21 Feb 2017 16:27:49 +0000 (16:27 +0000)]
Merge "[NAN] Security configuration (cipher)"

7 years agoMerge "libhardware_legacy: remove dead code in Android.mk"
Colin Cross [Tue, 21 Feb 2017 02:43:06 +0000 (02:43 +0000)]
Merge "libhardware_legacy: remove dead code in Android.mk"

7 years ago[AWARE]: Configure ranging on discovery sessions
Subhani Shaik [Thu, 26 Jan 2017 18:24:11 +0000 (10:24 -0800)]
[AWARE]: Configure ranging on discovery sessions

Add ranging configuration on discovery session. Remove
from overall NAN configuration (enable/config).

Add controls/structures based on spec protocol.

Bug: 33821639
Test: integration (sl4a) tests pass
Change-Id: Ibd1065c401672ca1f6d3781e373178401d1e4a62

7 years ago[NAN] Security configuration (cipher)
Etan Cohen [Fri, 17 Feb 2017 19:31:25 +0000 (11:31 -0800)]
[NAN] Security configuration (cipher)

Add a constant to make the no-cipher specification explicit.

Bug: 35387576
Test: integrated (sl4a) tests pass.
Change-Id: Ia272cad70cd4bedbdbdb4d2c856167305f747a30

7 years agoMerge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492...
Etan Cohen [Thu, 16 Feb 2017 21:15:02 +0000 (21:15 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492 am: 7417f60856
am: 9ba1142190

Change-Id: I9447de8e5bb84579681397e8d79b55db1614ea76

7 years agoMerge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492
Etan Cohen [Thu, 16 Feb 2017 21:10:32 +0000 (21:10 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492
am: 7417f60856

Change-Id: I5e6227b8f209199388ef8f5f0afebd7d62816786

7 years agoMerge "[AWARE]: Document the default values in NAN enable/config"
Etan Cohen [Thu, 16 Feb 2017 21:06:05 +0000 (21:06 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config"
am: 1ea0399492

Change-Id: I469dec8b95e75b083af9d5f5d5bce836f14ef8a6

7 years agoMerge "[AWARE]: Document the default values in NAN enable/config"
Etan Cohen [Thu, 16 Feb 2017 21:00:10 +0000 (21:00 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config"

7 years agoMerge "[AWARE]: Fix return code for transmitFollowUp method" am: f43910da9e am: f5983...
Etan Cohen [Thu, 16 Feb 2017 20:31:33 +0000 (20:31 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method" am: f43910da9e am: f59832297f
am: 59d92fd2b4

Change-Id: I275dd17d9624eb2f4f7089295175d2b92714c34f

7 years agoMerge "[AWARE]: Fix return code for transmitFollowUp method" am: f43910da9e
Etan Cohen [Thu, 16 Feb 2017 20:27:33 +0000 (20:27 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method" am: f43910da9e
am: f59832297f

Change-Id: Ia7aa6f16b189334f993436353e10b2b384b089b4

7 years agoMerge "[AWARE]: Fix return code for transmitFollowUp method"
Etan Cohen [Thu, 16 Feb 2017 20:23:06 +0000 (20:23 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method"
am: f43910da9e

Change-Id: I1df72f83ae9b02fedce5fc97d844e5e537883487

7 years agoMerge "[AWARE]: Fix return code for transmitFollowUp method"
Etan Cohen [Thu, 16 Feb 2017 20:16:45 +0000 (20:16 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method"

7 years ago[AWARE]: Document the default values in NAN enable/config
Subhani Shaik [Wed, 11 Jan 2017 23:08:00 +0000 (15:08 -0800)]
[AWARE]: Document the default values in NAN enable/config

Bug: 34059183
Change-Id: Ic651e93ef46d2f7ecf564f9a504db44d27401422

7 years ago[AWARE]: Fix return code for transmitFollowUp method
Subhani Shaik [Thu, 16 Feb 2017 06:20:20 +0000 (22:20 -0800)]
[AWARE]: Fix return code for transmitFollowUp method

7 years agolibhardware_legacy: remove dead code in Android.mk
Bin Chen [Mon, 13 Feb 2017 05:47:42 +0000 (16:47 +1100)]
libhardware_legacy: remove dead code in Android.mk

The commneted code is the only place in AOSP that still reference
BOARD_HAVE_BLUETOOTH and BOARD_USES_GENERIC_AUDIO. Delete it
to make things cleaner.

Test: Build
Change-Id: I37e3135bf2db2c6d46eb59d5a0de49d02c1a036d
Signed-off-by: Bin Chen <bin.chen@linaro.org>
7 years agoMerge "[AWARE] Clean up deprecated error value field" am: 7fe581f49c am: c49a818c31
Etan Cohen [Wed, 25 Jan 2017 23:39:58 +0000 (23:39 +0000)]
Merge "[AWARE] Clean up deprecated error value field" am: 7fe581f49c am: c49a818c31
am: afcac92321

Change-Id: I06fd82682f8f39bd0375629c97e83cc56f046b9b

7 years agoMerge "[AWARE] Clean up deprecated error value field" am: 7fe581f49c
Etan Cohen [Wed, 25 Jan 2017 23:37:27 +0000 (23:37 +0000)]
Merge "[AWARE] Clean up deprecated error value field" am: 7fe581f49c
am: c49a818c31

Change-Id: Id9f19db7c5e3589e8f3682185b0895244decc6b7

7 years agoMerge "[AWARE] Clean up deprecated error value field"
Etan Cohen [Wed, 25 Jan 2017 23:34:29 +0000 (23:34 +0000)]
Merge "[AWARE] Clean up deprecated error value field"
am: 7fe581f49c

Change-Id: Iee12961e0ac27654104e7fe73ed80d87b620cc27

7 years agoMerge "[AWARE] Clean up deprecated error value field"
Etan Cohen [Wed, 25 Jan 2017 23:30:37 +0000 (23:30 +0000)]
Merge "[AWARE] Clean up deprecated error value field"

7 years ago[AWARE] Clean up deprecated error value field
Etan Cohen [Tue, 29 Nov 2016 22:38:51 +0000 (14:38 -0800)]
[AWARE] Clean up deprecated error value field

Left deprecated field in place since it broke
dependent projects. Dependencies cleaned-up -
remove field.

Bug: 27914592
Test: build only requirements since unused field
Change-Id: I910ffd811ddbca9b83a0190eaede2a58b36fedc8

7 years agoMerge "Convert libpower from Android.mk to Android.bp" am: b9344a5773 am: ad31b35bdc
Colin Cross [Sat, 14 Jan 2017 04:34:28 +0000 (04:34 +0000)]
Merge "Convert libpower from Android.mk to Android.bp" am: b9344a5773 am: ad31b35bdc
am: edefe8017b

Change-Id: Ie8ad81dae319a9725da9885e160cd4fdfb62c8a8

7 years agoMerge "Convert libpower from Android.mk to Android.bp" am: b9344a5773
Colin Cross [Sat, 14 Jan 2017 04:31:58 +0000 (04:31 +0000)]
Merge "Convert libpower from Android.mk to Android.bp" am: b9344a5773
am: ad31b35bdc

Change-Id: I41eae92d0137552aa31ceb3d0ea9718b93f8b04e

7 years agoMerge "Convert libpower from Android.mk to Android.bp"
Colin Cross [Sat, 14 Jan 2017 04:28:57 +0000 (04:28 +0000)]
Merge "Convert libpower from Android.mk to Android.bp"
am: b9344a5773

Change-Id: Iccb9d303d50a34d701d95421b96b4bc95d5dae35

7 years agoMerge "Convert libpower from Android.mk to Android.bp"
Treehugger Robot [Sat, 14 Jan 2017 04:24:51 +0000 (04:24 +0000)]
Merge "Convert libpower from Android.mk to Android.bp"

7 years agoConvert libpower from Android.mk to Android.bp
Colin Cross [Tue, 8 Nov 2016 18:17:11 +0000 (10:17 -0800)]
Convert libpower from Android.mk to Android.bp

See build/soong/README.md for more information.

Test: builds
Change-Id: I4cc68e4bbe65abe741c02448aa7f42fdfd5804fa

7 years agoMerge changes from topic 'qc_api_drop' am: 6ffa14dd6c am: 4bcde74d50
Etan Cohen [Thu, 5 Jan 2017 18:02:09 +0000 (18:02 +0000)]
Merge changes from topic 'qc_api_drop' am: 6ffa14dd6c am: 4bcde74d50
am: 46397ba42e

Change-Id: Id2060065cc8e59e2232c1080f5b5526247d37222

7 years ago[AWARE]: Error code fix in NdpIndiatorRequest am: 3cdbc44764 am: af412749f0
Subhani Shaik [Thu, 5 Jan 2017 18:01:26 +0000 (18:01 +0000)]
[AWARE]: Error code fix in NdpIndiatorRequest am: 3cdbc44764 am: af412749f0
am: e041369d00

Change-Id: Ibefeb8b98f978b523735267da039a0f6b9f54de4

7 years ago[AWARE]: Config options to disable indications during Discovery am: 9c90771dee am...
Subhani Shaik [Thu, 5 Jan 2017 18:01:24 +0000 (18:01 +0000)]
[AWARE]: Config options to disable indications during Discovery am: 9c90771dee am: 4a1ece39eb
am: 549d13f9a1

Change-Id: I10ac05642a10c63593ba648e749e05d22ce2bf9c

7 years agoMerge changes from topic 'qc_api_drop' am: 6ffa14dd6c
Etan Cohen [Thu, 5 Jan 2017 17:58:36 +0000 (17:58 +0000)]
Merge changes from topic 'qc_api_drop' am: 6ffa14dd6c
am: 4bcde74d50

Change-Id: I4571b4c445deabf2ee2d2d702284cb90737e0f0a

7 years ago[AWARE]: Error code fix in NdpIndiatorRequest am: 3cdbc44764
Subhani Shaik [Thu, 5 Jan 2017 17:57:55 +0000 (17:57 +0000)]
[AWARE]: Error code fix in NdpIndiatorRequest am: 3cdbc44764
am: af412749f0

Change-Id: I7492227b08db6caba97b817d412ab924cfbdc1aa

7 years ago[AWARE]: Config options to disable indications during Discovery am: 9c90771dee
Subhani Shaik [Thu, 5 Jan 2017 17:57:53 +0000 (17:57 +0000)]
[AWARE]: Config options to disable indications during Discovery am: 9c90771dee
am: 4a1ece39eb

Change-Id: I0f8f8a98d3ba92a446588fa35d48578e8ae7f590

7 years agoMerge changes from topic 'qc_api_drop'
Etan Cohen [Thu, 5 Jan 2017 17:55:17 +0000 (17:55 +0000)]
Merge changes from topic 'qc_api_drop'
am: 6ffa14dd6c

Change-Id: I7e238a6e7e6c53241992771be39a1be85c333730

7 years ago[AWARE]: Error code fix in NdpIndiatorRequest
Subhani Shaik [Thu, 5 Jan 2017 17:54:24 +0000 (17:54 +0000)]
[AWARE]: Error code fix in NdpIndiatorRequest
am: 3cdbc44764

Change-Id: I4ffe6974f38564588ddd0eb55180229d13341f6d

7 years ago[AWARE]: Config options to disable indications during Discovery
Subhani Shaik [Thu, 5 Jan 2017 17:54:22 +0000 (17:54 +0000)]
[AWARE]: Config options to disable indications during Discovery
am: 9c90771dee

Change-Id: I8ff60d2eded1466918b8144d47972f4fd0a9181f

7 years agoMerge changes from topic 'qc_api_drop'
Etan Cohen [Thu, 5 Jan 2017 17:48:52 +0000 (17:48 +0000)]
Merge changes from topic 'qc_api_drop'

* changes:
  [AWARE]: Error code fix in NdpIndiatorRequest
  [AWARE]: Config options to disable indications during Discovery

7 years ago[AWARE]: Error code fix in NdpIndiatorRequest
Subhani Shaik [Wed, 4 Jan 2017 18:51:03 +0000 (10:51 -0800)]
[AWARE]: Error code fix in NdpIndiatorRequest

Bug: 32207606
Test: integration (sl4a) tests passing - no regressions
Change-Id: I0d0e995b8506b3fe44cd0dc419a187739fa448de

7 years ago[AWARE]: Config options to disable indications during Discovery
Subhani Shaik [Wed, 28 Dec 2016 00:53:44 +0000 (16:53 -0800)]
[AWARE]: Config options to disable indications during Discovery

Bug: 33250076
Test: integration (sl4a) tests passing - no regressions
Change-Id: I79b2ce07ed5798089e7762e6ba8e6f8a057928a6

7 years agoMerge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am: 6d26bb0360 am...
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

7 years agoMerge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am: 6d26bb0360
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

7 years agoMerge "[AWARE]: Enable ranging in Publish/Subscribe/Indication"
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

7 years agoMerge "[AWARE]: Enable ranging in Publish/Subscribe/Indication"
Etan Cohen [Thu, 22 Dec 2016 18:01:00 +0000 (18:01 +0000)]
Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication"

7 years ago[AWARE]: Enable ranging in Publish/Subscribe/Indication
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

7 years agoMerge "Roaming Enhancement API" am: ab920d2460 am: 9fc8d06e2f -s ours
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

7 years agoMerge "Roaming Enhancement API" am: ab920d2460
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

7 years agoMerge "Roaming Enhancement API"
Randy Pan [Tue, 13 Dec 2016 19:31:59 +0000 (19:31 +0000)]
Merge "Roaming Enhancement API"
am: ab920d2460

Change-Id: Ic45f3678794eee98570e9cb29d64e672d4a22669

7 years agoMerge "Roaming Enhancement API"
Randy Pan [Tue, 13 Dec 2016 19:25:40 +0000 (19:25 +0000)]
Merge "Roaming Enhancement API"

7 years agoMerge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp
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

7 years agoRoaming Enhancement API
Subhani Shaik [Tue, 13 Dec 2016 17:20:31 +0000 (17:20 +0000)]
Roaming Enhancement API
am: 75814ce428

Change-Id: I5ad4a09f94dcf2e6946af89ce09a75c2679fc560

7 years agoMerge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp
Randy Pan [Tue, 13 Dec 2016 17:16:21 +0000 (17:16 +0000)]
Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp

7 years agoMerge changes from topic 'aware_hal_updates' am: 33b3f09576 am: 1d8b72d050
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

7 years ago[AWARE]: Enable Service Descriptor Extension Attribute am: 0001cdb414 am: 45559af039
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

7 years ago[AWARE]: Enable Discovery MAC addr randomization am: f032356db0 am: 53fe3f6c9c
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

7 years ago[AWARE]: Enable NAN Security am: 548fbb3ab5 am: 6968799354
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

7 years ago[AWARE] Config/Publish/Subscribe DW interval config am: 79e0e1be8c am: 8ee3b96dd1
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

7 years ago[AWARE]: Include ndp operating channel in Sync stats am: 2383b51f66 am: ab84238365
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

7 years agoMerge changes from topic 'aware_hal_updates' am: 33b3f09576
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

7 years ago[AWARE]: Enable Service Descriptor Extension Attribute am: 0001cdb414
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

7 years ago[AWARE]: Enable Discovery MAC addr randomization am: f032356db0
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

7 years ago[AWARE]: Enable NAN Security am: 548fbb3ab5
Subhani Shaik [Tue, 13 Dec 2016 15:13:44 +0000 (15:13 +0000)]
[AWARE]: Enable NAN Security am: 548fbb3ab5
am: 6968799354

Change-Id: I6606803b630079150da0812e5c1f813a97e3f51f

7 years ago[AWARE] Config/Publish/Subscribe DW interval config am: 79e0e1be8c
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

7 years ago[AWARE]: Include ndp operating channel in Sync stats am: 2383b51f66
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

7 years agoMerge changes from topic 'aware_hal_updates'
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

7 years ago[AWARE]: Enable Service Descriptor Extension Attribute
Subhani Shaik [Tue, 13 Dec 2016 15:06:47 +0000 (15:06 +0000)]
[AWARE]: Enable Service Descriptor Extension Attribute
am: 0001cdb414

Change-Id: I2bd71eb03eb204805f4be4f5a225b1a7a74804c0

7 years ago[AWARE]: Enable Discovery MAC addr randomization
Subhani Shaik [Tue, 13 Dec 2016 15:06:45 +0000 (15:06 +0000)]
[AWARE]: Enable Discovery MAC addr randomization
am: f032356db0

Change-Id: Icaab72c73cae4b4579a93d7f90c0a006a16dc1bb

7 years ago[AWARE]: Enable NAN Security
Subhani Shaik [Tue, 13 Dec 2016 15:06:44 +0000 (15:06 +0000)]
[AWARE]: Enable NAN Security
am: 548fbb3ab5

Change-Id: I0e974dd5d77ac52271071c09cf294e58562783ce

7 years ago[AWARE] Config/Publish/Subscribe DW interval config
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

7 years ago[AWARE]: Include ndp operating channel in Sync stats
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

7 years agoMerge changes from topic 'aware_hal_updates'
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

7 years agoRoaming Enhancement API
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