OSDN Git Service
TreeHugger Robot [Wed, 3 May 2017 04:56:01 +0000 (04:56 +0000)]
Merge "A header was pulled in for a function we no longer use, so we can/should drop the #include as well."
Sandeep Patil [Wed, 3 May 2017 01:34:14 +0000 (01:34 +0000)]
Add functional vts test for Health HAL am:
d22e2c5a87
am:
c42d17f932
Change-Id: I42f411da9197a34a32b65ee6264a95af79d07959
Sandeep Patil [Wed, 3 May 2017 01:32:12 +0000 (01:32 +0000)]
Add functional vts test for Health HAL
am:
d22e2c5a87
Change-Id: I05d7849af6d9cc4ea0f9240ddf91b149f7d43ecf
Scott Randolph [Wed, 3 May 2017 00:56:54 +0000 (17:56 -0700)]
A header was pulled in for a function we no longer use, so we can/should
drop the #include as well.
Test: compile
Change-Id: I455f3a1137533e14297a310663e1b3f7ecb0607c
Nick Kralevich [Wed, 3 May 2017 00:41:27 +0000 (00:41 +0000)]
Merge "Revert "libkeymaster1 was split into libkeymaster and _portable""
Janis Danisevskis [Wed, 3 May 2017 00:24:26 +0000 (00:24 +0000)]
Revert "libkeymaster1 was split into libkeymaster and _portable"
This reverts commit
beee35c850632c3e1b006242122665a84a5fc7f6.
Reason for revert: fix broken build
Change-Id: I60762c834b6837c78027574dda54c5382dbcceec
Sandeep Patil [Tue, 2 May 2017 21:28:31 +0000 (14:28 -0700)]
Add functional vts test for Health HAL
Bug:
35915444
Test: Boot and run the test successfully on sailfish
Change-Id: I5965d1ffbc4f1a89454f962698ce67adc4c35293
Signed-off-by: Sandeep Patil <sspatil@google.com>
Tomasz Wasilczyk [Tue, 2 May 2017 22:54:40 +0000 (22:54 +0000)]
Merge "Convert android.hardware.broadcastradio@1.x-impl to soong."
Steven Moreland [Tue, 2 May 2017 22:42:20 +0000 (22:42 +0000)]
Remove redundant dependencies
am:
5c63b11f76 -s ours
Change-Id: I7202ff28201e78c6c36f4805d9c9bb99db9cd3d0
TreeHugger Robot [Tue, 2 May 2017 22:39:18 +0000 (22:39 +0000)]
Merge "EVS: Android.bp -> Android.mk"
Steven Moreland [Tue, 2 May 2017 16:46:22 +0000 (09:46 -0700)]
Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.
Test: links
Bug:
33276472
Merged-In: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
TreeHugger Robot [Tue, 2 May 2017 21:51:19 +0000 (21:51 +0000)]
Merge "Remove redundant dependencies"
Janis Danisevskis [Tue, 2 May 2017 21:51:15 +0000 (21:51 +0000)]
Merge "libkeymaster1 was split into libkeymaster and _portable"
Steven Moreland [Tue, 2 May 2017 20:57:15 +0000 (13:57 -0700)]
EVS: Android.bp -> Android.mk
EVS currently violates VNDK restrictions. Since it is in Soong,
this effects all targets. Temporarily converting it to make
until its dependencies are figured out so that we can enable
the VNDK on continuous integration only for Soong targets.
Test: links
Bug:
37426620
Change-Id: I9935ac764a4339bf8831ac720ab3de783c43f94f
Tomasz Wasilczyk [Tue, 2 May 2017 15:45:50 +0000 (08:45 -0700)]
Convert android.hardware.broadcastradio@1.x-impl to soong.
Bug:
37512442
Test: it builds
Change-Id: If5bd21af21324e323efe3bc2fd77fe0d23560ea5
Steven Moreland [Tue, 2 May 2017 19:26:40 +0000 (19:26 +0000)]
Merge "ContextHub: IWYU" into oc-dev-plus-aosp
am:
ad024e52e4
Change-Id: I421da187660f619b49ea0997061ea8a968c4fed1
Steven Moreland [Tue, 2 May 2017 19:26:32 +0000 (19:26 +0000)]
Merge "Sensors: IWYU" into oc-dev-plus-aosp
am:
43ac9a6740
Change-Id: I5402bb51c6609b46eeb0185ba6abc5fb7853dd83
Steven Moreland [Tue, 2 May 2017 19:26:27 +0000 (19:26 +0000)]
Merge "Vehicle: IWYU" into oc-dev-plus-aosp
am:
cbe9865043
Change-Id: Iab2f3d5eebb818711928a87106402f1fefd8f2a2
TreeHugger Robot [Tue, 2 May 2017 19:18:33 +0000 (19:18 +0000)]
Merge "ContextHub: IWYU" into oc-dev-plus-aosp
TreeHugger Robot [Tue, 2 May 2017 19:18:33 +0000 (19:18 +0000)]
Merge "Sensors: IWYU" into oc-dev-plus-aosp
TreeHugger Robot [Tue, 2 May 2017 19:18:33 +0000 (19:18 +0000)]
Merge "Vehicle: IWYU" into oc-dev-plus-aosp
Scott Randolph [Tue, 2 May 2017 19:11:12 +0000 (19:11 +0000)]
Merge "Add YUV support in EVS VTS tests" into oc-dev am:
b3d108de74
am:
9a4edfb40b
Change-Id: I1e68f72ecf39dd2e4730dbe5b7e7b7ca414c86e0
Scott Randolph [Tue, 2 May 2017 19:06:43 +0000 (19:06 +0000)]
Merge "Add YUV support in EVS VTS tests" into oc-dev
am:
b3d108de74
Change-Id: I66c5c2cc4b08ee9dd8ec5f2f7d24d5fcda71245c
Steven Moreland [Mon, 1 May 2017 20:07:56 +0000 (13:07 -0700)]
ContextHub: IWYU
android-base macros was being transitively included from MQDescriptor.h
Test: links
Bug:
37791060
Change-Id: I2433462aae3d68a0d90cd6817338ba70d343b833
(cherry picked from commit
56b4c24bb7d36efa9edbd8e53e95f6161ac41e87)
Steven Moreland [Mon, 1 May 2017 20:20:59 +0000 (13:20 -0700)]
Sensors: IWYU
Missing dependency that was being transitively included
from MQDescriptor.h.
Test: links
Bug:
37791060
Change-Id: I5afca1596c83801a49ee0aead85499a5241608e0
(cherry picked from commit
5b42945e6ad042e02d4ffe3794cbbf886f374420)
Steven Moreland [Tue, 2 May 2017 00:30:04 +0000 (17:30 -0700)]
Vehicle: IWYU
Missing dependency that was being transitively included
from MQDescriptor.h.
Test: links
Bug:
37791060
Change-Id: I90ccb2edabab8c63429caa0884f6c5820c29fe11
(cherry picked from commit
356c2ced1dd58915ba3997c80a3db56b1a8fdc0e)
TreeHugger Robot [Tue, 2 May 2017 18:59:28 +0000 (18:59 +0000)]
Merge "Add YUV support in EVS VTS tests" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 18:46:37 +0000 (18:46 +0000)]
Merge "Vehicle: IWYU"
Steven Thomas [Tue, 2 May 2017 18:09:31 +0000 (18:09 +0000)]
Merge "Avoid crash when setting buffer on deleted layer" into oc-dev am:
6dbaf573a2
am:
67795a72da
Change-Id: Ie3b0e16f39ae9879ff9ba73c477246a6db17de65
Steven Thomas [Tue, 2 May 2017 18:06:11 +0000 (18:06 +0000)]
Merge "Avoid crash when setting buffer on deleted layer" into oc-dev
am:
6dbaf573a2
Change-Id: I919634ebcd7ff859cd6d52fcc95747810d1fd911
Steven Thomas [Tue, 2 May 2017 17:47:23 +0000 (17:47 +0000)]
Merge "Avoid crash when setting buffer on deleted layer" into oc-dev
Steven Thomas [Wed, 26 Apr 2017 22:24:28 +0000 (15:24 -0700)]
Avoid crash when setting buffer on deleted layer
When setLayerBuffer() was called on a layer previously destroyed by
destroyLayer() the code would crash. Instead, return an error.
Bug:
37159844
Test: Ran vr flinger in a way that would trigger the crash, and
confirmed that I now get error logs instead of crashing. Unfortunately
the error code is consumed by the Composer wrapper class and not
propagated back to the caller, but that's a separate issue (b/
37901601).
Change-Id: I75a5b954d47a1deac44d03851f60f347085eca89
Steven Moreland [Tue, 2 May 2017 16:46:22 +0000 (09:46 -0700)]
Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.
Test: links
Bug:
33276472
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
Scott Randolph [Wed, 26 Apr 2017 00:52:25 +0000 (17:52 -0700)]
Add YUV support in EVS VTS tests
Additionally adds log markers at test start and ends tests early which
fail necessary preconditions.
Test: Run against default and sample EVS drivers
bug:
37687125
Change-Id: Ie34674df5fe099dd4f380df485801ab0288147e9
Steven Moreland [Tue, 2 May 2017 00:30:04 +0000 (17:30 -0700)]
Vehicle: IWYU
Missing dependency that was being transitively included
from MQDescriptor.h.
Test: links
Bug:
37791060
Change-Id: I90ccb2edabab8c63429caa0884f6c5820c29fe11
Yifan Hong [Tue, 2 May 2017 07:45:03 +0000 (07:45 +0000)]
Merge "Add framework compatibility matrix" into oc-dev am:
ee7f6fae84
am:
876e28db8b
Change-Id: Id7bc8ee4a1814751e340c5211762dfef99be7333
Yifan Hong [Tue, 2 May 2017 07:42:32 +0000 (07:42 +0000)]
Merge "Add framework compatibility matrix" into oc-dev
am:
ee7f6fae84
Change-Id: Ia0be3968c85e660d0842de8704acfb4b2572f0ef
TreeHugger Robot [Tue, 2 May 2017 07:39:48 +0000 (07:39 +0000)]
Merge "Add framework compatibility matrix" into oc-dev
Yifan Hong [Fri, 28 Apr 2017 23:14:37 +0000 (16:14 -0700)]
Add framework compatibility matrix
Test: builds and verify that system/compatibility_matrix.xml exist
Bug:
37321309
Change-Id: Ic336e7660a19a4c2b5104739e0b7ace11096fcf7
Steven Moreland [Mon, 1 May 2017 23:53:56 +0000 (23:53 +0000)]
Merge "Remove redundant dependencies" am:
62769b7196 am:
170e2e85a2 am:
5fba1db1d2
am:
f90189a79f
Change-Id: I6ccecef314c8cd591108a0c739580eda2178425e
Steven Moreland [Mon, 1 May 2017 23:37:04 +0000 (23:37 +0000)]
Merge "Remove redundant dependencies" am:
62769b7196 am:
170e2e85a2
am:
5fba1db1d2
Change-Id: I661fff75d140b4359af055a0f08f08ef33c889c3
Steven Moreland [Mon, 1 May 2017 23:33:33 +0000 (23:33 +0000)]
Merge "Remove redundant dependencies" am:
62769b7196
am:
170e2e85a2
Change-Id: I05315464b2a8f4482a9999f0bba4ef35b0c38fb7
Steven Moreland [Mon, 1 May 2017 23:30:00 +0000 (23:30 +0000)]
Merge "Remove redundant dependencies"
am:
62769b7196
Change-Id: Ie576459d47efdb1120b92a0e7c1a052b0ac15443
Treehugger Robot [Mon, 1 May 2017 23:19:24 +0000 (23:19 +0000)]
Merge "Remove redundant dependencies"
TreeHugger Robot [Mon, 1 May 2017 22:47:49 +0000 (22:47 +0000)]
Merge changes from topic 'hidl-libbase-remove-depends'
* changes:
Sensors: IWYU
ContextHub: IWYU
TreeHugger Robot [Mon, 1 May 2017 21:54:26 +0000 (21:54 +0000)]
Merge "ContextHub: Android.mk -> Android.bp"
Chia-I Wu [Mon, 1 May 2017 21:15:44 +0000 (21:15 +0000)]
Merge "graphics: polish Transform docs and indent ColorMode" into oc-dev am:
76061d7881
am:
c412a65e98
Change-Id: I4c3bf6c8970b8ace2745298503c7c35828a039a3
Chia-I Wu [Mon, 1 May 2017 21:13:44 +0000 (21:13 +0000)]
Merge "graphics: polish Transform docs and indent ColorMode" into oc-dev
am:
76061d7881
Change-Id: Id4e47c5c3ded892b1e4e91bda88358a84b65fa6e
TreeHugger Robot [Mon, 1 May 2017 21:09:36 +0000 (21:09 +0000)]
Merge "graphics: polish Transform docs and indent ColorMode" into oc-dev
Steven Moreland [Mon, 1 May 2017 20:20:59 +0000 (13:20 -0700)]
Sensors: IWYU
Missing dependency that was being transitively included
from MQDescriptor.h.
Test: links
Bug:
37791060
Change-Id: I5afca1596c83801a49ee0aead85499a5241608e0
Steven Moreland [Mon, 1 May 2017 20:07:56 +0000 (13:07 -0700)]
ContextHub: IWYU
android-base macros was being transitively included from MQDescriptor.h
Test: links
Bug:
37791060
Change-Id: I2433462aae3d68a0d90cd6817338ba70d343b833
Steven Moreland [Mon, 1 May 2017 20:07:08 +0000 (13:07 -0700)]
ContextHub: Android.mk -> Android.bp
Test: link
Change-Id: Id6e63e49e95b2a3f859e293b8e18b06f76bc70e6
Janis Danisevskis [Wed, 26 Apr 2017 22:05:37 +0000 (15:05 -0700)]
libkeymaster1 was split into libkeymaster and _portable
libkeyamster1 was split into libkeymaster and
libkeymaster_portable.
Test: keymaster vts test and keystore cts test
Change-Id: Ia117199f07f6d55d35b2ae781ebab62386006474
Steven Moreland [Mon, 1 May 2017 16:47:58 +0000 (09:47 -0700)]
Remove redundant dependencies
android.hidl.base@1.0 and android.hidlmanager@1.0 are built into libhidltransport.
Test: links
Bug:
33276472
Change-Id: I424371932af129bba9d58dcf8652c64297f35f05
Mikhail Naganov [Mon, 1 May 2017 15:32:21 +0000 (15:32 +0000)]
Merge "audiohal: Get rid of multiple inheritance in IDevice implementation" into oc-dev am:
5d3a3fd5a2
am:
e27bec3249
Change-Id: Idedc87f29fce7f952a76185308c16e5e1b8958d7
Mikhail Naganov [Mon, 1 May 2017 15:30:21 +0000 (15:30 +0000)]
Merge "audiohal: Get rid of multiple inheritance in IDevice implementation" into oc-dev
am:
5d3a3fd5a2
Change-Id: I924836d44a708d0e6b4964fa49cfac48fa6d5fc3
Mikhail Naganov [Mon, 1 May 2017 15:23:58 +0000 (15:23 +0000)]
Merge "audiohal: Get rid of multiple inheritance in IDevice implementation" into oc-dev
Yipeng Cao [Sat, 29 Apr 2017 22:49:30 +0000 (22:49 +0000)]
Merge "Fixed the hasCarrierFrequency flag in GnssStatus(part 2)" into oc-dev am:
dc24ef0ff3
am:
0a210de9e2
Change-Id: Ia52cd55c8268ba9aff1e6c7a82c65f43065036b3
Yipeng Cao [Sat, 29 Apr 2017 22:42:30 +0000 (22:42 +0000)]
Merge "Fixed the hasCarrierFrequency flag in GnssStatus(part 2)" into oc-dev
am:
dc24ef0ff3
Change-Id: I28a312340c0990ec89e9015c76f7839f44af4f77
Yipeng Cao [Sat, 29 Apr 2017 22:34:55 +0000 (22:34 +0000)]
Merge "Fixed the hasCarrierFrequency flag in GnssStatus(part 2)" into oc-dev
Ningyuan Wang [Sat, 29 Apr 2017 20:54:03 +0000 (20:54 +0000)]
Merge "Fix RssiMonitoring VTS tests" into oc-dev am:
5c604fc1d4
am:
c3191c6c84
Change-Id: I9f41f2db9b511c49f6bcf6d813b59d26e747687c
Ningyuan Wang [Sat, 29 Apr 2017 20:49:34 +0000 (20:49 +0000)]
Merge "Fix RssiMonitoring VTS tests" into oc-dev
am:
5c604fc1d4
Change-Id: I2dd80498e6c3aa3ad05656229acfd04b7f937337
TreeHugger Robot [Sat, 29 Apr 2017 20:44:27 +0000 (20:44 +0000)]
Merge "Fix RssiMonitoring VTS tests" into oc-dev
Chia-I Wu [Sat, 29 Apr 2017 19:28:27 +0000 (19:28 +0000)]
Merge "graphics: remvoe -Wno-unused-parameter" into oc-dev am:
aa7cfc9f0d
am:
6979195d90
Change-Id: I016c445dfff3777e2a7f271c02108ff916a5dbed
Chia-I Wu [Sat, 29 Apr 2017 19:26:57 +0000 (19:26 +0000)]
Merge "graphics: remvoe -Wno-unused-parameter" into oc-dev
am:
aa7cfc9f0d
Change-Id: I5a48015541985ed0f31f024f2698423ceabd50f8
TreeHugger Robot [Sat, 29 Apr 2017 19:22:48 +0000 (19:22 +0000)]
Merge "graphics: remvoe -Wno-unused-parameter" into oc-dev
TreeHugger Robot [Sat, 29 Apr 2017 06:55:01 +0000 (06:55 +0000)]
Merge changes from topic 'fix_mess'
* changes:
Revert "Revert "android.hardware.camera.provider@2.4: set up /dev/vndbinder""
Revert "Revert "composer: route binder traffic over vndbinder""
Steven Moreland [Sat, 29 Apr 2017 03:14:26 +0000 (03:14 +0000)]
nfc: Android.mk -> Android.bp am:
238dd8a83c am:
570e021780 am:
df032be4c9
am:
334c0e19fd
Change-Id: I861d6135d90bb6618daf77992d14cc5b41fa4dfd
Steven Moreland [Sat, 29 Apr 2017 03:05:27 +0000 (03:05 +0000)]
nfc: Android.mk -> Android.bp am:
238dd8a83c am:
570e021780
am:
df032be4c9
Change-Id: I2396585a08a006bc1dc062d69c6d0f74ecde4005
Steven Moreland [Sat, 29 Apr 2017 03:02:26 +0000 (03:02 +0000)]
nfc: Android.mk -> Android.bp am:
238dd8a83c
am:
570e021780
Change-Id: Iac5a7ceb249c16540ec2f7201fa01bad4dbfe7de
Steven Moreland [Sat, 29 Apr 2017 02:59:24 +0000 (02:59 +0000)]
nfc: Android.mk -> Android.bp
am:
238dd8a83c
Change-Id: Ib9e26069a58e86d4ab94f2ea5afde7ae1fd8dcc4
Steven Moreland [Fri, 28 Apr 2017 00:52:45 +0000 (17:52 -0700)]
nfc: Android.mk -> Android.bp
Test: links
Change-Id: Ia19dafb3ff6bf5772d72133bb2e1687226e0d44f
Mikhail Naganov [Fri, 28 Apr 2017 20:20:56 +0000 (13:20 -0700)]
audiohal: Get rid of multiple inheritance in IDevice implementation
We still not sure what causes crashes in Device::get|setParam*,
but it seems that it is somehow caused by the fact that the parameters
code is in a separate class with virtual methods, from which
Device class inherits along with IDevice interface.
The workaround is to substitute multiple inheritance with
delegation in Device class. Hopefully this will either eliminate
crashes or make the underlying reasons more clear.
Some of the code got reformatted by clang-format as a presubmit
requirement.
Bug:
36225019
Test: make
Change-Id: Id785c3565bbebd5acc26ca46472961698d9c6208
John W. Bruce [Sat, 29 Apr 2017 00:01:51 +0000 (00:01 +0000)]
Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev am:
3fec5a6498
am:
3b361d8548
Change-Id: I717ef249e77045bb51a8d39fc20bf35850300f28
John W. Bruce [Sat, 29 Apr 2017 00:00:12 +0000 (00:00 +0000)]
Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev
am:
3fec5a6498
Change-Id: I9a92b21accd342f3781c9198de40515d556db930
TreeHugger Robot [Fri, 28 Apr 2017 23:56:37 +0000 (23:56 +0000)]
Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev
Martijn Coenen [Mon, 17 Apr 2017 20:55:04 +0000 (13:55 -0700)]
Revert "Revert "android.hardware.camera.provider@2.4: set up /dev/vndbinder""
This reverts commit
e6bc6729210aa59faa7467f5e8f0844f116515be.
Test: marlin boots, camera works
Bug:
37302783
Change-Id: I73eb18d56020e345a0e2d6e90961512281de6644
Martijn Coenen [Mon, 17 Apr 2017 19:41:32 +0000 (12:41 -0700)]
Revert "Revert "composer: route binder traffic over vndbinder""
This reverts commit
7465550883a69e732c534d4b945f43697d358b97.
Bug:
37302783
Test: marlin boots
Change-Id: I9c4b6affbadaee01cc222c4368baa1136b54b55a
Yipeng Cao [Fri, 28 Apr 2017 01:29:25 +0000 (18:29 -0700)]
Fixed the hasCarrierFrequency flag in GnssStatus(part 2)
Bug:
37757180
Fixes:
37757180
Test: cts-tradefed run cts -m CtsLocationTestCases --test
android.location.cts.GnssStatusTest
Change-Id: I817931ee2c19d0a770c4d7cedfbd69bc85db6978
Chang-Id: Icf4240ccad7ff367d96001973c0be36308ffd9b3
Chia-I Wu [Fri, 28 Apr 2017 20:03:34 +0000 (13:03 -0700)]
graphics: remvoe -Wno-unused-parameter
Bug:
34611192
Test: builds
Change-Id: I8d6802ee6c618ea506fcca8e7d74e3b7026f29be
Chia-I Wu [Fri, 28 Apr 2017 19:16:14 +0000 (12:16 -0700)]
graphics: polish Transform docs and indent ColorMode
Note, current.txt change (as opposed to addition) is only allowed
because this is an unreleased interface.
Bug:
32593292
Test: builds
Change-Id: I95381d1a3a456aeadbc472e2dbbffde19cb43e6c
Mikhail Naganov [Fri, 28 Apr 2017 15:37:51 +0000 (15:37 +0000)]
Merge "audiohal: Support stateful downmixer effects" into oc-dev am:
9f5b6aaf73
am:
e179f58268
Change-Id: I02aad4aa1fba965cb4bfe1b51b8a3208bc0b6e4c
Mikhail Naganov [Fri, 28 Apr 2017 15:35:19 +0000 (15:35 +0000)]
Merge "audiohal: Support stateful downmixer effects" into oc-dev
am:
9f5b6aaf73
Change-Id: Ib08f30c728e226becfb746692fc6a03dca3943b2
Mikhail Naganov [Fri, 28 Apr 2017 15:29:21 +0000 (15:29 +0000)]
Merge "audiohal: Support stateful downmixer effects" into oc-dev
Yin-Chia Yeh [Fri, 28 Apr 2017 08:10:12 +0000 (08:10 +0000)]
Merge "Camera: use framework header for VideoNativeHandleMetadata" into oc-dev am:
d4fc468392
am:
c9ec7cc179
Change-Id: Ibed3f21770a48478bd16610828f24181179e1ca2
Yin-Chia Yeh [Fri, 28 Apr 2017 08:08:12 +0000 (08:08 +0000)]
Merge "Camera: use framework header for VideoNativeHandleMetadata" into oc-dev
am:
d4fc468392
Change-Id: If8ee83d2dbeda3c417d14b6c81ef284a8c3fb668
TreeHugger Robot [Fri, 28 Apr 2017 08:01:49 +0000 (08:01 +0000)]
Merge "Camera: use framework header for VideoNativeHandleMetadata" into oc-dev
Niranjan Pendharkar [Fri, 28 Apr 2017 05:33:03 +0000 (05:33 +0000)]
Merge "Tether Offload HAL" am:
e9b4ab6723 am:
cd60c276d1 am:
df1f2bfb28
am:
f1df0fc6b1
Change-Id: I92c5c46f9660847a4a50a7f22213edbbaf118f40
Niranjan Pendharkar [Fri, 28 Apr 2017 05:30:33 +0000 (05:30 +0000)]
Merge "Tether Offload HAL" am:
e9b4ab6723 am:
cd60c276d1
am:
df1f2bfb28
Change-Id: Ib567927ae597569e47e33e56f7e9998a9b3850cf
Niranjan Pendharkar [Fri, 28 Apr 2017 05:28:32 +0000 (05:28 +0000)]
Merge "Tether Offload HAL" am:
e9b4ab6723
am:
cd60c276d1
Change-Id: I709458a5e29a3b058acd6b7f8b5d26f509748659
Niranjan Pendharkar [Fri, 28 Apr 2017 05:26:05 +0000 (05:26 +0000)]
Merge "Tether Offload HAL"
am:
e9b4ab6723
Change-Id: I58d0c821e55ae8b460ffedb79a2314fffffe0b39
Treehugger Robot [Fri, 28 Apr 2017 05:21:40 +0000 (05:21 +0000)]
Merge "Tether Offload HAL"
Steven Moreland [Fri, 28 Apr 2017 04:31:57 +0000 (04:31 +0000)]
vehicle: respect result of registerAsService
am:
eb8e1a7dc5
Change-Id: I8e56fc006857da27c2155e8683ea839ab5062e5e
Steven Moreland [Wed, 26 Apr 2017 18:42:24 +0000 (11:42 -0700)]
vehicle: respect result of registerAsService
(cherry picked from commit
e50f2efab5b1f42e6a908272458975c8bced0cdb)
Test: works with https://android-review.googlesource.com/c/358172/
Change-Id: I73bb43f0759f4e396ededf4d8ef7f13711c13276
Steven Moreland [Fri, 28 Apr 2017 03:24:53 +0000 (03:24 +0000)]
Merge "configstore-utils: vendor_available" am:
c3e640c7f0 am:
759e1d28bd am:
51ba6a1e43
am:
c2af01d66b
Change-Id: If892a18b257de48fb3ba983ddaefd2e94da9ef0d
Steven Moreland [Fri, 28 Apr 2017 03:18:22 +0000 (03:18 +0000)]
Merge "configstore-utils: vendor_available" am:
c3e640c7f0 am:
759e1d28bd
am:
51ba6a1e43
Change-Id: I9fc5652422f983e37c195abec84ba594993d1407
Steven Moreland [Fri, 28 Apr 2017 03:16:39 +0000 (03:16 +0000)]
Merge "configstore-utils: vendor_available" am:
c3e640c7f0
am:
759e1d28bd
Change-Id: I6e33aad2c993029d3c1e6be139108edf4ebaf136
Steven Moreland [Fri, 28 Apr 2017 03:14:21 +0000 (03:14 +0000)]
Merge "configstore-utils: vendor_available"
am:
c3e640c7f0
Change-Id: Ied49d6affe69099bc08a58e1d5e38052d018a2e8
Treehugger Robot [Fri, 28 Apr 2017 03:06:35 +0000 (03:06 +0000)]
Merge "configstore-utils: vendor_available"
Ashutosh Joshi [Fri, 28 Apr 2017 02:26:21 +0000 (02:26 +0000)]
Merge "Move sensor hal service to class 'hal' from main." into oc-dev am:
bbac6adea2
am:
e7b1157ad8
Change-Id: Ifae3994849b0627165fc8ea828dfd0f45b2787bc
OSDN Git Service
