OSDN Git Service
gitbuildkicker [Tue, 18 Apr 2017 07:08:50 +0000 (00:08 -0700)]
merge in oc-release history after reset to oc-dev
Steven Moreland [Mon, 17 Apr 2017 20:38:11 +0000 (13:38 -0700)]
libhardware_legacy: vendor_available
Test: build with BOARD_VNDK_VERSION := current
Change-Id: Iccc3a0301a28de52fc17102d251ce728d372ba5c
TreeHugger Robot [Mon, 17 Apr 2017 18:10:25 +0000 (18:10 +0000)]
Merge "Mark as vendor_available" into oc-dev
Dan Willemsen [Fri, 7 Apr 2017 21:15:02 +0000 (14:15 -0700)]
Mark as vendor_available
By setting vendor_available, the following may become true:
* a prebuilt library from this release may be used at runtime by
in a later releasse (by vendor code compiled against this release).
so this library shouldn't depend on runtime state that may change
in the future.
* this library may be loaded twice into a single process (potentially
an old version and a newer version). The symbols will be isolated
using linker namespaces, but this may break assumptions about 1
library in 1 process (your singletons will run twice).
Background:
This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.
At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.
It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:
https://android-review.googlesource.com/368372
None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.
Bug:
36426473
Bug:
36079834
Bug:
37343006
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Test: attempt to compile with BOARD_VNDK_VERSION := current
Merged-In: I3f1e4986c5920b4a64768636cb0bc37fa602c7a7
Change-Id: I3f1e4986c5920b4a64768636cb0bc37fa602c7a7
Steven Moreland [Fri, 14 Apr 2017 08:19:25 +0000 (01:19 -0700)]
libhardware_legacy: Android.mk -> Android.bp
Test: builds with BOARD_VNDK_VERSION := current
Test: (sanity) Boots and works on internal marlin.
Bug:
33241851
Bug:
29915755
Change-Id: Ic355174a67860afa13377bc9d8f0a140f59ec34e
gitbuildkicker [Thu, 13 Apr 2017 07:09:10 +0000 (00:09 -0700)]
merge in oc-release history after reset to oc-dev
Dan Willemsen [Fri, 7 Apr 2017 21:15:02 +0000 (14:15 -0700)]
Include what you use
This doesn't need utils/Log.h, only log/log.h (and liblog)
Bug:
33241851
Test: m -j libpower
Merged-In: I21b08203fad51902d4a0f6172b4321b8b701ec47
Change-Id: I21b08203fad51902d4a0f6172b4321b8b701ec47
gitbuildkicker [Thu, 6 Apr 2017 07:08:32 +0000 (00:08 -0700)]
merge in oc-release history after reset to oc-dev
Vijay Venkatraman [Tue, 4 Apr 2017 21:31:55 +0000 (14:31 -0700)]
Exporting headers as libhardware_legacy_headers
Bug:
33241851
Test: Build sailfish
Change-Id: I05dac45051713ac56b53b2d8fd8b01281dbe0db1
(cherry picked from commit
a150372fcced9669304dc0c7e269b7fbb79cdda4)
gitbuildkicker [Thu, 23 Mar 2017 07:08:56 +0000 (00:08 -0700)]
merge in oc-release history after reset to master
gitbuildkicker [Thu, 23 Mar 2017 04:23:24 +0000 (21:23 -0700)]
merge in oc-release history after reset to master
Etan Cohen [Thu, 23 Mar 2017 00:31:07 +0000 (00:31 +0000)]
Merge "[AWARE]: Add support to accept either passphrase or pmk" am:
ad6f1d5512 am:
adedd72dd1
am:
9a46e19052
Change-Id: I136dd9be16b2c187d86ab4a6b16db486f7084123
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
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
gitbuildkicker [Thu, 23 Mar 2017 00:14:44 +0000 (17:14 -0700)]
merge in oc-release history after reset to
568e414ac5a62911664ae7498ebcc07204cc5f75
Etan Cohen [Thu, 23 Mar 2017 00:10:33 +0000 (00:10 +0000)]
Merge "[AWARE]: Add support to accept either passphrase or pmk"
gitbuildkicker [Wed, 22 Mar 2017 07:09:19 +0000 (00:09 -0700)]
merge in oc-release history after reset to master
Etan Cohen [Tue, 21 Mar 2017 18:08:32 +0000 (18:08 +0000)]
Merge "[AWARE]: Fix Nan capabilities mismatch" am:
980baf1bd7 am:
41fc794eff
am:
79e9afe244
Change-Id: I1a5a77de97f8abecd182acdd64c3951d44572576
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
Etan Cohen [Tue, 21 Mar 2017 18:01:03 +0000 (18:01 +0000)]
Merge "[AWARE]: Fix Nan capabilities mismatch"
am:
980baf1bd7
Change-Id: I01b2d62e40d25be61463ca93ea2153ce086a2be3
Etan Cohen [Tue, 21 Mar 2017 17:55:39 +0000 (17:55 +0000)]
Merge "[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
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
gitbuildkicker [Tue, 14 Mar 2017 01:36:19 +0000 (18:36 -0700)]
merge in oc-release history after reset to master
gitbuildkicker [Tue, 14 Mar 2017 00:18:40 +0000 (17:18 -0700)]
merge in oc-release history after reset to
b1ac19f3800c8edb91ab2d46ee189799fd5f82db
Etan Cohen [Thu, 9 Mar 2017 23:39:24 +0000 (23:39 +0000)]
Merge "[AWARE]: Add range report in SDEA params" am:
1da29541bc am:
eaed213c02
am:
93dea20a32
Change-Id: Ic6c22e9969c8522d40cd6fa5556e940dd6cfd34a
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
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
Etan Cohen [Thu, 9 Mar 2017 23:13:29 +0000 (23:13 +0000)]
Merge "[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
Etan Cohen [Wed, 8 Mar 2017 18:02:34 +0000 (18:02 +0000)]
Merge "Include get_iface_handle in header file" am:
ea2adcc23a am:
9aaa236e05
am:
457553179e
Change-Id: I6a73e75f26c371578656e0efae338058f4ccd7cd
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
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
Etan Cohen [Wed, 8 Mar 2017 17:53:06 +0000 (17:53 +0000)]
Merge "Include 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
Etan Cohen [Fri, 24 Feb 2017 02:23:40 +0000 (02:23 +0000)]
Merge "[AWARE]: Fix documentation for Service responder policy" am:
b82ef271aa am:
8f1dad1734
am:
d87a902689
Change-Id: I2fc3eeb1c9b288730679872fb08d397062df16d8
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
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
Etan Cohen [Fri, 24 Feb 2017 02:15:27 +0000 (02:15 +0000)]
Merge "[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
Etan Cohen [Tue, 21 Feb 2017 22:54:36 +0000 (22:54 +0000)]
Merge "[AWARE]: Enable SDEA based SSI" am:
83b034ea0f am:
f9758f839e
am:
560bbbdff4
Change-Id: I1bf3c3a36f365a64b2a50c6e4c0c46e9d44353c4
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
Etan Cohen [Tue, 21 Feb 2017 22:50:05 +0000 (22:50 +0000)]
Merge "[AWARE]: Enable SDEA based SSI"
am:
83b034ea0f
Change-Id: I35f133f43353f5e690d064672c58012b5c61ad4f
Etan Cohen [Tue, 21 Feb 2017 22:47:25 +0000 (22:47 +0000)]
Merge "[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
Etan Cohen [Tue, 21 Feb 2017 18:00:59 +0000 (18:00 +0000)]
Merge "[AWARE]: Configure ranging on discovery sessions" am:
427212dafe am:
df1ea57d7c
am:
6c707e7bc4
Change-Id: I5dc373ffcf63c3e66a3bec2f3f544629788233f3
Etan Cohen [Tue, 21 Feb 2017 18:00:40 +0000 (18:00 +0000)]
Merge "[NAN] Security configuration (cipher)" am:
0f9dc48b2c am:
f24303c6ec
am:
1aa8b4f330
Change-Id: Ic0335cc3e2c9833c83cd3d1497fa3f03a5502b52
Colin Cross [Tue, 21 Feb 2017 18:00:32 +0000 (18:00 +0000)]
Merge "libhardware_legacy: remove dead code in Android.mk" am:
955b796f36 am:
fa192e08eb
am:
20107d1fc9
Change-Id: I4344edee0d02c8df684147bde83ab67bf95c9a99
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
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
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
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
Etan Cohen [Tue, 21 Feb 2017 17:56:44 +0000 (17:56 +0000)]
Merge "[NAN] Security configuration (cipher)"
am:
0f9dc48b2c
Change-Id: Id7ad1e6adee225bbc885ca23a973a04512858016
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
Etan Cohen [Tue, 21 Feb 2017 16:32:19 +0000 (16:32 +0000)]
Merge "[AWARE]: Configure ranging on discovery sessions"
Etan Cohen [Tue, 21 Feb 2017 16:27:49 +0000 (16:27 +0000)]
Merge "[NAN] Security configuration (cipher)"
Colin Cross [Tue, 21 Feb 2017 02:43:06 +0000 (02:43 +0000)]
Merge "libhardware_legacy: remove dead code in Android.mk"
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
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
Etan Cohen [Thu, 16 Feb 2017 21:19:56 +0000 (21:19 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config" am:
1ea0399492 am:
7417f60856 am:
9ba1142190
am:
c9a3c2b7e5
Change-Id: I213deacae4f5339b425833a65068fd3d802d0bcb
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
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
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
Etan Cohen [Thu, 16 Feb 2017 21:00:10 +0000 (21:00 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config"
Etan Cohen [Thu, 16 Feb 2017 20:36:12 +0000 (20:36 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method" am:
f43910da9e am:
f59832297f am:
59d92fd2b4
am:
ac800456df
Change-Id: If944bd9d5bc17ec3ec80500d35ce7eaf5e0ea3d0
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
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
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
Etan Cohen [Thu, 16 Feb 2017 20:16:45 +0000 (20:16 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method"
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
Subhani Shaik [Thu, 16 Feb 2017 06:20:20 +0000 (22:20 -0800)]
[AWARE]: Fix return code for transmitFollowUp method
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>
Etan Cohen [Wed, 25 Jan 2017 23:42:27 +0000 (23:42 +0000)]
Merge "[AWARE] Clean up deprecated error value field" am:
7fe581f49c am:
c49a818c31 am:
afcac92321
am:
8d2b9ea4b4
Change-Id: Ibaf3daab1c29332a8333373e5489518afbfaffad
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
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
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
Etan Cohen [Wed, 25 Jan 2017 23:30:37 +0000 (23:30 +0000)]
Merge "[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
Colin Cross [Sat, 14 Jan 2017 04:50:53 +0000 (04:50 +0000)]
Merge "Convert libpower from Android.mk to Android.bp" am:
b9344a5773 am:
ad31b35bdc am:
edefe8017b
am:
6e88e36531
Change-Id: Ib3836cfc05ff75e7aef370905a15fa023dc29b40
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
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
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
Treehugger Robot [Sat, 14 Jan 2017 04:24:51 +0000 (04:24 +0000)]
Merge "Convert 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
Etan Cohen [Thu, 5 Jan 2017 18:06:08 +0000 (18:06 +0000)]
Merge changes from topic 'qc_api_drop' am:
6ffa14dd6c am:
4bcde74d50 am:
46397ba42e
am:
b5def3a364
Change-Id: If40725244b1854c07111c1a90e157fc9ab38083a
Subhani Shaik [Thu, 5 Jan 2017 18:05:26 +0000 (18:05 +0000)]
[AWARE]: Error code fix in NdpIndiatorRequest am:
3cdbc44764 am:
af412749f0 am:
e041369d00
am:
8639303275
Change-Id: Ia33ffdf48ac3bd205a7c429803687e1b9c75315d
Subhani Shaik [Thu, 5 Jan 2017 18:05:24 +0000 (18:05 +0000)]
[AWARE]: Config options to disable indications during Discovery am:
9c90771dee am:
4a1ece39eb am:
549d13f9a1
am:
367e66126d
Change-Id: I3815acd2de023787603436580b57deeba20541b2
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
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
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
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
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
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
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
Subhani Shaik [Thu, 5 Jan 2017 17:54:24 +0000 (17:54 +0000)]
[AWARE]: Error code fix in NdpIndiatorRequest
am:
3cdbc44764
Change-Id: I4ffe6974f38564588ddd0eb55180229d13341f6d
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
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
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
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
Etan Cohen [Thu, 22 Dec 2016 18:45:03 +0000 (18:45 +0000)]
Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am:
6d26bb0360 am:
c61d69fba8 am:
f23cd51227
am:
ed2d9617f5
Change-Id: I819370327c8be3474e011dbfcd6a2ee1c2011771
OSDN Git Service
