OSDN Git Service
Yifan Hong [Thu, 6 Jul 2017 18:07:41 +0000 (18:07 +0000)]
Merge "Add libandroid_sensor_headers"
TreeHugger Robot [Wed, 5 Jul 2017 19:24:19 +0000 (19:24 +0000)]
Merge "Package media/*/*.h headers as a headers lib: media_plugin_headers"
TreeHugger Robot [Wed, 5 Jul 2017 03:39:41 +0000 (03:39 +0000)]
Merge "dumpstate/Android.mk is converted to Android.bp"
TreeHugger Robot [Wed, 5 Jul 2017 02:56:39 +0000 (02:56 +0000)]
Merge "fix a signed/unsigned comparison warning"
George Burgess IV [Thu, 22 Jun 2017 21:23:54 +0000 (14:23 -0700)]
fix a signed/unsigned comparison warning
The comparison was farther down; we'd compare a size_t vector index
with an int index.
Complaint from clang:
vr_hwc.cpp:152:11: warning: comparison of integers of different signs:
'size_t' (aka 'unsigned long') and 'int'
Bug: None
Test: mma shows no more warning.
Change-Id: Icabb5d4bb3c554ffe01a25af975a05bd58f336a1
Jiyong Park [Thu, 29 Jun 2017 05:21:37 +0000 (14:21 +0900)]
Package media/*/*.h headers as a headers lib: media_plugin_headers
Headers under frameworks/native/include/media serves as an interface
that is meant to be implemented by vendors. For example.
media/hardware/CryptoAPI.h is implemented under
vendor/widevine/libwvdrmengine/mediacrypto.
When building with BOARD_VNDK_VERSION, the headers are not accessible to
vendors since they have been included via the global include paths and
the paths are not available when building with BOARD_VNDK_VERSION.
So, we need to make a "headers library" for the media headers and modify
vendors to use the headers lib. Usually, we have been doing this by
moving the headers into a subdirectory (usually 'include') of a module
that implements the headers. But, this approach can't be used at this
time since the media headers are implemented by many modules.
The chosen solution is to a separate directory headers/media_plugin and
define a headers lib named media_plugin_headers there.
Note: frameworks/native/headers will now be the home for such
header-only libraries.
Bug:
63120269
Test: build
Change-Id: I67d625706b40d06c8f0602284fbcc1cc8b174c6f
Jiyong Park [Fri, 23 Jun 2017 12:23:16 +0000 (21:23 +0900)]
dumpstate/Android.mk is converted to Android.bp
Converted to soong. And libdumpstateutil is marked as
vendor_available:true.
Bug:
37342627
Test: BOARD_VNDK_VERSION=current m libdumpstateutil.vendor -j
Change-Id: Id1594d9aa2a7035aaad901d4c3881bd6128c431e
Yifan Hong [Sat, 1 Jul 2017 00:19:27 +0000 (17:19 -0700)]
Add libandroid_sensor_headers
This is a subset of NDK headers for vendor modules to use.
It only includes headers for sensors.
Test: m libsensorndkbridge -j
Test: BOARD_VNDK_VERSION=current m libsensorndkbridge.vendor -j
Bug:
33241851
Change-Id: Ia5ab876441f2f7d437a516aa97961b7a3540048d
Chia-I Wu [Fri, 30 Jun 2017 23:31:53 +0000 (23:31 +0000)]
surfaceflinger: refresh after latching any buffer am:
a36bf92663
am:
81876de166
Change-Id: I6a62ab9052f47f9d97bc30029aa20546094ab9a7
Chia-I Wu [Fri, 30 Jun 2017 23:24:33 +0000 (23:24 +0000)]
surfaceflinger: refresh after latching any buffer
am:
a36bf92663
Change-Id: If437e00a4c8aeda42f26150066a4fd7baaad485e
Chia-I Wu [Fri, 30 Jun 2017 19:51:05 +0000 (12:51 -0700)]
surfaceflinger: refresh after latching any buffer
We should not skip refresh when a latched buffer happens to have an
empty dirty region. Also, we should signal a layer update when we
skip refresh.
Bug:
62752640
Test: manual
Change-Id: Ia603e7eeb37491c6ece7ea08d5d1e3b7ba93e6fa
Daniel Nicoara [Fri, 30 Jun 2017 15:50:41 +0000 (15:50 +0000)]
Merge "Fix potential access to invalid memory during shutdown" into oc-dr1-dev am:
77e9eeba69
am:
0e2e44357e
Change-Id: Ic061370a3ef751a8e36a372832e931fa3a516549
Daniel Nicoara [Fri, 30 Jun 2017 15:46:07 +0000 (15:46 +0000)]
Merge "Fix potential access to invalid memory during shutdown" into oc-dr1-dev
am:
77e9eeba69
Change-Id: I5b5703ab3b70755d3f8b8e2674c7c32ce0e1c05b
TreeHugger Robot [Fri, 30 Jun 2017 15:36:48 +0000 (15:36 +0000)]
Merge "Fix potential access to invalid memory during shutdown" into oc-dr1-dev
Luke Song [Fri, 30 Jun 2017 02:24:48 +0000 (02:24 +0000)]
Merge "Add dvr api entries for sensor enable/disable" into oc-dr1-dev am:
0a9bae53bc
am:
18dcaf1795
Change-Id: Idbe478fd131ac74966bfdabb26d9422b79731b3e
Luke Song [Fri, 30 Jun 2017 02:20:48 +0000 (02:20 +0000)]
Merge "Add dvr api entries for sensor enable/disable" into oc-dr1-dev
am:
0a9bae53bc
Change-Id: I8ad0fedbac9cf950bf6917a524cb50839b41a362
Luke Song [Fri, 30 Jun 2017 02:14:54 +0000 (02:14 +0000)]
Merge "Add dvr api entries for sensor enable/disable" into oc-dr1-dev
Phil Weaver [Fri, 30 Jun 2017 02:13:21 +0000 (02:13 +0000)]
Merge "Trust navbar panel and accessibility overlays" into oc-dr1-dev am:
b5f0e91c4c
am:
c89bac8f6e
Change-Id: Iefedb1d008614884b1bd3d0abd5bbb7d1b1788fe
Phil Weaver [Fri, 30 Jun 2017 02:04:48 +0000 (02:04 +0000)]
Merge "Trust navbar panel and accessibility overlays" into oc-dr1-dev
am:
b5f0e91c4c
Change-Id: Ia00e2b0cbaba95b3265171bbe1e13cb86813c511
Phil Weaver [Fri, 30 Jun 2017 01:57:31 +0000 (01:57 +0000)]
Merge "Trust navbar panel and accessibility overlays" into oc-dr1-dev
Luke Song [Tue, 27 Jun 2017 21:03:45 +0000 (14:03 -0700)]
Add dvr api entries for sensor enable/disable
Follow-up to ag/
2263549 because we want to use it in VrCore now.
Bug:
63070540
Test: Api call in VrCore
Change-Id: Ic3b2c68ade31008ada8078a74ebe2945748143ae
Daniel Nicoara [Fri, 23 Jun 2017 16:48:01 +0000 (12:48 -0400)]
Fix potential access to invalid memory during shutdown
Since binder threads have a reference to the callback, need to make sure
it is properly reset before deleting the DvrHwcClient object.
Bug:
63139142
Test: Ran on device to ensure VrCore restart don't result in crashes in
DvrHwcClient
Change-Id: I559844a70d4483fee3148526f704d234994a96d4
Chavi Weingarten [Thu, 29 Jun 2017 20:34:52 +0000 (20:34 +0000)]
Merge "Fixed CropLatchingTest that was failing"
Corey Tabaka [Thu, 29 Jun 2017 18:54:08 +0000 (18:54 +0000)]
Merge changes Id4647e54,I66b6edbd into oc-dr1-dev am:
bf72631a10
am:
f036493fab
Change-Id: Ie396445c41942ab6bbeaf35c504a3be004d5e473
Corey Tabaka [Thu, 29 Jun 2017 18:53:49 +0000 (18:53 +0000)]
Merge changes I9047b298,Id9554d6b into oc-dr1-dev am:
e6ffd49479
am:
e241cbaa7d
Change-Id: I29e56cb95b74097c70ba19cc356472ee06e2fac1
Corey Tabaka [Thu, 29 Jun 2017 18:50:09 +0000 (18:50 +0000)]
Merge changes Id4647e54,I66b6edbd into oc-dr1-dev
am:
bf72631a10
Change-Id: Ib1f5d7cc4841124c4f5fc1ea543ce3984dc26d16
Corey Tabaka [Thu, 29 Jun 2017 18:49:52 +0000 (18:49 +0000)]
Merge changes I9047b298,Id9554d6b into oc-dr1-dev
am:
e6ffd49479
Change-Id: I8ac6a10b071dd5293dda9347d590b92c9cea0124
TreeHugger Robot [Thu, 29 Jun 2017 18:44:52 +0000 (18:44 +0000)]
Merge changes Id4647e54,I66b6edbd into oc-dr1-dev
* changes:
Fix VR surface attributes.
DVR API: Implement support for deleting surface attributes.
TreeHugger Robot [Thu, 29 Jun 2017 18:44:35 +0000 (18:44 +0000)]
Merge changes I9047b298,Id9554d6b into oc-dr1-dev
* changes:
libdvr: Add performance API to platform library.
libpdx_uds: Fix uninitialized variable bug.
Karthik Ravi Shankar [Thu, 29 Jun 2017 04:32:26 +0000 (04:32 +0000)]
Merge "Add VrFlinger dumpsys to SurfaceFlinger" into oc-dr1-dev am:
ae11e71bb7
am:
9579e3cd94
Change-Id: I3f56806205f651d714255c66a1b1bd8e0cc73f6d
Karthik Ravi Shankar [Thu, 29 Jun 2017 04:28:27 +0000 (04:28 +0000)]
Merge "Add VrFlinger dumpsys to SurfaceFlinger" into oc-dr1-dev
am:
ae11e71bb7
Change-Id: Ic3ac3d8b16a14aed3fb3553616c4adec23044f7a
TreeHugger Robot [Thu, 29 Jun 2017 04:21:05 +0000 (04:21 +0000)]
Merge "Add VrFlinger dumpsys to SurfaceFlinger" into oc-dr1-dev
Corey Tabaka [Fri, 23 Jun 2017 03:39:42 +0000 (20:39 -0700)]
Fix VR surface attributes.
VR surface attributes had two issues that prevented the full extent
of their use:
1. The older clang version missed that templated copy constructor
and assignment operators do not override the default ones in
the Variant class. This caused issues with certain types when
copy constructing / assigning from another Variant of the same
type. This was noticed by running tests with a newer version of
clang which provided warnings.
2. C++ rules about implicit conversion to bool from types that
decay to pointers causes subtle issues with Variants that have
bool elements.
For example this assignment compiles but produces the wrong
result:
const int array[3] = { 1, 2, 3};
Variant<int, bool, std::array<int, 3>> variant = array;
EXPECT_FALSE(variant.is<bool>()); // Actually true.
Here the programmer might accidentally think that the std::array
element of the variant can be assigned from the regular array.
This doesn't work, but instead the compiler decays the array to
a pointer and assigns the bool element to true.
The first issue is addressed by defining copy/move constructors /
assignment operators on Variant and deleting the default ones from
the internal Union type for extra safety.
The second issue is addressed by making a more restrictive version
of the std::is_constructible trait that rejects bool construction
from types that decay to pointers. Once this was put in place the
erroneous use cases no longer compiled and is fixed as part of
this CL.
Tests are updated to verify the fixes to these issues.
Bug:
62557221
Test: pdx_tests and dvr_api-test passes.
Change-Id: Id4647e54e0a7b1753217fe7fe351462fe5bcfd83
Corey Tabaka [Fri, 23 Jun 2017 23:20:07 +0000 (16:20 -0700)]
libdvr: Add performance API to platform library.
- Add dvrPerformanceSetSchedulerPolicy API. Only this API is exposed
through the DVR platform library, the older API will be deprecated.
- Add permission checks to all performanced APIs.
- Allow services with android.permission.RESTRICTED_VR_ACCESS to change
scheduler policy for VR apps.
- Minor updates to use the updated PDX service API. The older API will
be deprecated soon.
- Add tests for permission checks and policy API.
Most of the tests are automatic however, there is one manual step for
testing the android.permission.RESTRICTED_VR_ACCESS (e.g. trusted uid)
check. Because there is no reliable way to determine the UID of VrCore
from the gtest, instead the gtest looks for an env var named
GTEST_TRUSTED_UID; if this is set the value is used as a uid and the
trusted uid tests are enabled.
Bug:
62468109
Test: 'GTEST_TRUSTED_UID=<VrCore UID> performance_service_tests' passes.
Change-Id: I9047b298a015a69535b655a299ca26c179e2d57d
Corey Tabaka [Thu, 8 Jun 2017 21:29:58 +0000 (14:29 -0700)]
DVR API: Implement support for deleting surface attributes.
- Implement support for deleting surface attributes using the "NONE"
attribute type.
- Add tests for attribute events and attribute deletion.
Bug:
62456002
Test: dvr_api-test passes.
Change-Id: I66b6edbd35077596d89e85829bcbe7c52829ef5b
chaviw [Wed, 28 Jun 2017 23:39:06 +0000 (16:39 -0700)]
Fixed CropLatchingTest that was failing
FinalCropLatchingRegressionForb37531386 test was failing
do to an incorrect assertion. Also added the test classes that
were not yet added to the filter so they run in presubmit.
Change-Id: Ia298ac2e9f64809373f9d0267325c6b51b70d9c5
Karthik Ravi Shankar [Wed, 28 Jun 2017 22:40:24 +0000 (15:40 -0700)]
Add VrFlinger dumpsys to SurfaceFlinger
When we do dumpsys SurfaceFlinger, we get no information about the
layers/what is composed when the device is in VR mode.
Bug:
63113212
Test:
VrFlinger state:
Application Surfaces:
Surface 0: surface_id=11 process_id=5550 user_id=10104 visible=1
z_order=0 queue_ids=29,37
Surface 1: surface_id=13 process_id=5035 user_id=10130 visible=1
z_order=0 queue_ids=53,65
Direct Surfaces:
Surface 0: surface_id=8 process_id=5563 user_id=10104 visible=1
z_order=0 queue_ids=17
Display metrics: 1440x2880 537.882x537.882 dpi @ 60 Hz
Post thread resumed: 1
Active layers: 1
Layer 0: type=Device surface_id=8 buffer_id=19
Hardware Composer Debug Info:
-------------------------------
HWC2 display_id: 0
layer: 30 z: 0 compositon: Device/Device alpha: 255 format:
RGBA_8888_UBWC dataspace:0x00000000 transform: 0/0/0 buffer_id:
0x70b4877500
color modes supported: 0 7 9 current mode: 7
current transform:
1.08 -0.02 -0.02 0.00
-0.07 1.03 -0.07 0.00
-0.01 -0.01 1.09 0.00
0.00 0.00 0.00 1.00
-------------------------------
This section doesn't appear when the device is not in VR mode.
Change-Id: I2961a05fc3ea303e070be08de355fb6e56c3d0db
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
Jayachandran C [Wed, 28 Jun 2017 19:15:19 +0000 (19:15 +0000)]
Merge "Add telephony related dumpsys in the telephony monitor bugreports" into oc-dr1-dev am:
d16d297825
am:
f8b9f54e47
Change-Id: Ibfa4db88795a5953ad8dd1d327d2bf8b2ba2249c
Jayachandran C [Wed, 28 Jun 2017 19:11:19 +0000 (19:11 +0000)]
Merge "Add telephony related dumpsys in the telephony monitor bugreports" into oc-dr1-dev
am:
d16d297825
Change-Id: Id02616a3d6084a18bdf6a3b87868eb1e1f905a9a
TreeHugger Robot [Wed, 28 Jun 2017 19:01:17 +0000 (19:01 +0000)]
Merge "Add telephony related dumpsys in the telephony monitor bugreports" into oc-dr1-dev
Corey Tabaka [Mon, 26 Jun 2017 23:51:43 +0000 (16:51 -0700)]
libpdx_uds: Fix uninitialized variable bug.
In this code path epoll_wait() returns 0 when the operation times
out, but there is no condition to catch this and return the
approptiate status. This allows the event value to be used
uninitialized, which returns a junk pending event mask.
This bug results in BufferHub queues sometimes thinking that the
producer side of the buffer hung up, when the junk value happens
to have the EPOLLHUP bit set.
Bug:
62886596
Test: Observe VR app switching stability.
Change-Id: Id9554d6bf224fd27815ff042ac145f59041d0aae
Jayachandran C [Sat, 10 Jun 2017 22:08:12 +0000 (15:08 -0700)]
Add telephony related dumpsys in the telephony monitor bugreports
Collect dumpsys for the following in telephony monitor auto
generated bugreports for better debugging
1) TelephonyDebugService
2) CarrierConfig
3) Connectivity
Test: Verified telephony monintor auto generated bugreport
Bug:
62504502
Change-Id: Ia2a9e1ff5b289dec7a4d0bb4e8ef85fb413df87a
Robert Carr [Wed, 28 Jun 2017 00:12:58 +0000 (00:12 +0000)]
Merge "Merge "SurfaceFlinger: Last minute log removal." into oc-dev am:
56cca289cc am:
d5547979ec" into oc-dr1-dev-plus-aosp
am:
62da928d92
Change-Id: Ie4fd3fe54b06d7061e4d9e57786a361c91a7ab77
Robert Carr [Wed, 28 Jun 2017 00:12:38 +0000 (00:12 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev am:
56cca289cc am:
a75a975dc8
am:
8e73ea0c99
Change-Id: I704080d3be3170b4d3046e492d19b4e789be9177
Android Build Merger (Role) [Wed, 28 Jun 2017 00:09:20 +0000 (00:09 +0000)]
Merge "Merge "SurfaceFlinger: Last minute log removal." into oc-dev am:
56cca289cc am:
d5547979ec" into oc-dr1-dev-plus-aosp
Robert Carr [Wed, 28 Jun 2017 00:09:08 +0000 (00:09 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev am:
56cca289cc
am:
a75a975dc8
Change-Id: I1b4544d48d3248edc5621af1218b38a3ad0d9cae
Robert Carr [Wed, 28 Jun 2017 00:09:08 +0000 (00:09 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev am:
56cca289cc
am:
d5547979ec
Change-Id: I1a6c13f9fd00d082425b374e440e5d8482260b73
Robert Carr [Wed, 28 Jun 2017 00:06:38 +0000 (00:06 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev
am:
56cca289cc
Change-Id: Ib4448b62b985fac82c24fb81aef550ba7d0280a9
Robert Carr [Wed, 28 Jun 2017 00:06:37 +0000 (00:06 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev
am:
56cca289cc
Change-Id: I07e2b1c1efd0cc8eec73467fdd4ef88bf36f081c
TreeHugger Robot [Tue, 27 Jun 2017 23:59:16 +0000 (23:59 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev
Dan Stoza [Tue, 27 Jun 2017 23:10:54 +0000 (23:10 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev am:
fb672ba37b am:
f64e75d2f0
am:
8b961670ad
Change-Id: I6a7658f2c6cd4c4a5ed0afcb4711fe2d7216d383
Dan Stoza [Tue, 27 Jun 2017 23:10:33 +0000 (23:10 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev am:
fb672ba37b am:
1813e093bd
am:
ba01bec3b4
Change-Id: I9d45dc2a97af80a3a7625c07a528b3a04bcc7bde
Dan Stoza [Tue, 27 Jun 2017 23:04:08 +0000 (23:04 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev am:
fb672ba37b
am:
f64e75d2f0
Change-Id: Icf927506ab83ac03c754658625520eca4cd1b529
Dan Stoza [Tue, 27 Jun 2017 23:03:33 +0000 (23:03 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev am:
fb672ba37b
am:
1813e093bd
Change-Id: I9ca3c8a6bb058177cf47e8d0f8ca5a38d003c686
Dan Stoza [Tue, 27 Jun 2017 23:01:03 +0000 (23:01 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev
am:
fb672ba37b
Change-Id: I90f2ebe102c40c70620ca12bda5000b455109d26
Dan Stoza [Tue, 27 Jun 2017 23:01:03 +0000 (23:01 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev
am:
fb672ba37b
Change-Id: I14c99a3137f086eca4e1c1ab2f8877ae6df88a4a
TreeHugger Robot [Tue, 27 Jun 2017 22:54:05 +0000 (22:54 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev
Robert Carr [Tue, 27 Jun 2017 20:51:07 +0000 (13:51 -0700)]
SurfaceFlinger: Last minute log removal.
Whoops.
Test: Log removed!
Change-Id: I4593352cf565603a4507c6ef13504b167d882eec
Mengjiao Yang [Tue, 27 Jun 2017 19:22:40 +0000 (19:22 +0000)]
Merge "Fix percentile calculations"
TreeHugger Robot [Tue, 27 Jun 2017 18:28:27 +0000 (18:28 +0000)]
Merge "Fix a warning about redefining arraysize"
TreeHugger Robot [Tue, 27 Jun 2017 18:25:45 +0000 (18:25 +0000)]
Merge "Fix an incorrect format specifier in printf"
Sherry Yang [Thu, 15 Jun 2017 18:32:06 +0000 (11:32 -0700)]
Fix percentile calculations
Adjust max latency in running binderThroughputTest
to improve percentile accuracy. We used to use a fixed
max latency which is devided into time buckets to obtain
the round trip latency percentile. The actual latency,
however, can be much smaller than the max latency, which
results in measurements from all iterations ending up in
the same bucket and leads to inaccurate percentile
measurement. This is resolved by either performing a
training round (option -t), which sets the max latency to
two times the worst latency during training, or by providing
a max latency (option -m) in millisecond by the caller.
Use --help option to see usage.
Bug:
62660944
Change-Id: Iaa23837eb24b90012ae20c35f20caae33986b35a
Fixes:
62660944
Test: Running "binderThroughputTest -p -w 2 -i 10000 -s 0" on marlin-3.18 used to show the same percentile values for 50%, 90%, 95%, and 99%. Now with -t flag,percentile values are different.
Signed-off-by: Sherry Yang <sherryy@google.com>
Jiyong Park [Tue, 27 Jun 2017 08:11:43 +0000 (08:11 +0000)]
Merge "resolve merge conflicts of
40da4609e to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am:
cbfbd85c8e
Change-Id: I54192e31782629a629231d0ef6f0a49788e9f6e7
Jiyong Park [Tue, 27 Jun 2017 08:07:13 +0000 (08:07 +0000)]
Merge "resolve merge conflicts of
40da4609e to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Peng Xu [Tue, 27 Jun 2017 04:49:58 +0000 (04:49 +0000)]
Merge "Fix hidl_ssvc_poll thread issues" into oc-dr1-dev am:
d8ef90752b
am:
1f9e5b0710 -s ours
Change-Id: I1524b4deb01eda9c6b8644e90be17d26bb8491a1
Peng Xu [Tue, 27 Jun 2017 04:47:32 +0000 (04:47 +0000)]
Merge "Fix hidl_ssvc_poll thread issues" into oc-dr1-dev
am:
d8ef90752b
Change-Id: I713984531740a01f33335d516393a522b662d53c
TreeHugger Robot [Tue, 27 Jun 2017 04:43:20 +0000 (04:43 +0000)]
Merge "Fix hidl_ssvc_poll thread issues" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 02:23:38 +0000 (02:23 +0000)]
Merge "Fix signed/unsigned integer comparison warning"
TreeHugger Robot [Tue, 27 Jun 2017 01:54:39 +0000 (01:54 +0000)]
Merge "Fix trivial compiler warnings"
Jiyong Park [Tue, 27 Jun 2017 00:59:06 +0000 (09:59 +0900)]
resolve merge conflicts of
40da4609e to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0c4a9e0648674b78391e257f6a94bd1e325e1964
Jiyong Park [Tue, 27 Jun 2017 00:45:13 +0000 (00:45 +0000)]
Merge "libbinder: really make it available to vendors" am:
2bb661ca09
am:
99daab345f
Change-Id: Ief871803389339a3d423787502535c824f35e74e
Jiyong Park [Tue, 27 Jun 2017 00:42:42 +0000 (00:42 +0000)]
Merge "libbinder: really make it available to vendors"
am:
2bb661ca09
Change-Id: I58c2069544d39337b3a054a29fe8fdf98d00a33e
Treehugger Robot [Tue, 27 Jun 2017 00:35:48 +0000 (00:35 +0000)]
Merge "libbinder: really make it available to vendors"
Phil Weaver [Mon, 26 Jun 2017 23:22:26 +0000 (16:22 -0700)]
Trust navbar panel and accessibility overlays
Fixes:
62048165
Fixes:
62341768
Test: Enable maximum screen display and font size, enable TalkBack.
Enable Select to Speak with FAB, enable TalkBack.
Change-Id: Ia96373200adf9c5d306e9c61da9c65ba412c9430
George Burgess IV [Tue, 27 Jun 2017 00:13:09 +0000 (17:13 -0700)]
Fix signed/unsigned integer comparison warning
allowed_pending_fence_count is apparently an int32_t, which made clang
unhappy when compared with the size_t from calling size().
Cast size() to an int32_t, since I doubt we'll have > 2.1 billion FDs
open any time soon. :)
Bug: None
Test: mma. Warning is gone.
Change-Id: I895b2c6e1a6d5a42c692470f6a5c5fd22d55b2ff
George Burgess IV [Tue, 27 Jun 2017 00:03:20 +0000 (17:03 -0700)]
Fix an incorrect format specifier in printf
This was causing clang to complain:
buffer_hub_queue_producer.cpp:137:28: warning: format specifies type
'unsigned long long' but the argument has type 'uint64_t' (aka 'unsigned
long')
Bug: None
Test: mma. Warning is gone
Change-Id: I578c5a910727a578557777ca531ea17a3c90cee8
George Burgess IV [Mon, 26 Jun 2017 23:48:14 +0000 (16:48 -0700)]
Fix a warning about redefining arraysize
Simply removing the redeclaration yields new signed/unsigned conversion
warnings, since the previously-defined arraysize (from
android-base/macros.h) hands back a size_t.
Rather than #undef'ing and continuing on, it looks like we can
trivially get away without needing arraysize at all.
Bug: None
Test: mma. Warnings disappeared.
Change-Id: I56da4dfb0e29edec10d276147e7b5d99fc32c65b
Peng Xu [Sun, 25 Jun 2017 23:43:02 +0000 (16:43 -0700)]
Fix hidl_ssvc_poll thread issues
1) Patch poll wake up handling logic so that thread no longer quits
on spurious wake up.
2) Patch(simplify) thread initialization, so that it will not hang
on waiting for conditional variable.
Test: 1) send signal 3 to system_server, does not observe thread quit.
Test: 2) adb shell "stop;start" many times, every time thread starts.
Bug:
62933449
Bug:
62933799
Merged-In: Icb7477e9d75338b9742e144fc2687d5ced91e89e
Change-Id: Icb7477e9d75338b9742e144fc2687d5ced91e89e
Kalle Raita [Mon, 26 Jun 2017 23:15:06 +0000 (16:15 -0700)]
Fix trivial compiler warnings
Test: Compile & executed many of the tests on Marlin
Change-Id: I2d88922c5dcc88de0394c5bfade02ca1dd9d7b60
Peng Xu [Sun, 25 Jun 2017 23:43:02 +0000 (16:43 -0700)]
Fix hidl_ssvc_poll thread issues
1) Patch poll wake up handling logic so that thread no longer quits
on spurious wake up.
2) Patch(simplify) thread initialization, so that it will not hang
on waiting for conditional variable.
Test: 1) send signal 3 to system_server, does not observe thread quit.
Test: 2) adb shell "stop;start" many times, every time thread starts.
Bug:
62933449
Bug:
62933799
Change-Id: Icb7477e9d75338b9742e144fc2687d5ced91e89e
Jiyong Park [Fri, 14 Apr 2017 04:19:48 +0000 (21:19 -0700)]
libbinder: really make it available to vendors
Fixed a bug that vendor variant of the lib is not built due to missing
global include path.
Bug:
36426473
Bug:
36079834
Test: BOARD_VNDK_VERSION=current m -j libbinder.vendor successful
Change-Id: Ice32a23023d7fd9b78c084c3bef455f7008fe4da
Dan Stoza [Mon, 26 Jun 2017 21:27:18 +0000 (14:27 -0700)]
libgui: New mutex for ConsumerBase frame callbacks
Adds a new mutex to protect ConsumerBase's mFrameAvailableListener
separately from the main mMutex. This prevents deadlocks when trying
to perform callbacks in response to other calls that come through
ConsumerBase.
Bug:
62915791
Test: EncodeVirtualDisplayWithCompositionTest#
testRenderingMaxResolutionRemotely
Change-Id: I244dc2d83488e452d9690c0d7847c9ff15a95dbb
Steven Moreland [Mon, 26 Jun 2017 18:04:28 +0000 (18:04 +0000)]
Merge "libgui: export EGL headers." into oc-dr1-dev am:
be2e363c9e
am:
3806ea87d6
Change-Id: Id6c0664a5fa64aadc3a5360d9cd9ea9a97c2b78f
Steven Moreland [Mon, 26 Jun 2017 17:59:55 +0000 (17:59 +0000)]
Merge "libgui: export EGL headers." into oc-dr1-dev
am:
be2e363c9e
Change-Id: Id87eb01463f03ba0bcbe4948a93f3add60fc0b7e
TreeHugger Robot [Mon, 26 Jun 2017 17:54:11 +0000 (17:54 +0000)]
Merge "libgui: export EGL headers." into oc-dr1-dev
Jeff Vander Stoep [Sat, 24 Jun 2017 00:34:55 +0000 (00:34 +0000)]
Merge "Revert "libui: Load a.h.graphics.mapper passthrough service on library load"" into oc-dr1-dev am:
274f72eb9b
am:
01f4c4a3c6
Change-Id: I327b9cfb1a85502b719ea6704d631b9be2bb879d
Jeff Vander Stoep [Sat, 24 Jun 2017 00:28:22 +0000 (00:28 +0000)]
Merge "Revert "libui: Load a.h.graphics.mapper passthrough service on library load"" into oc-dr1-dev
am:
274f72eb9b
Change-Id: Ie94b3b6d08c4ca0a13902fd4ec71e4bc7808831f
TreeHugger Robot [Sat, 24 Jun 2017 00:04:43 +0000 (00:04 +0000)]
Merge "Revert "libui: Load a.h.graphics.mapper passthrough service on library load"" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 23:35:54 +0000 (23:35 +0000)]
Merge "Convert tests to Android.bp"
Jeff Vander Stoep [Fri, 23 Jun 2017 18:41:04 +0000 (11:41 -0700)]
Revert "libui: Load a.h.graphics.mapper passthrough service on library load"
This reverts commit
75ca86f072f82d38b21e0a13234ecbc2c24cb6ab.
avc: denied { read } name="hw" scontext=u:r:cameraserver:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:folio_daemon:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:hal_imsrtp:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:idmap:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:mediaextractor:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:mediametrics:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:webview_zygote:s0
tcontext=u:object_r:system_file:s0 tclass=dir
Bug:
62353585
Bug:
62912747
Bug:
35197529
Test: build and boot device. Launch camera, take pictures.
Change-Id: Ic6884f7235edb9191034a285414eb93aa44ac23c
Kevin Schoedel [Fri, 23 Jun 2017 20:53:10 +0000 (20:53 +0000)]
Merge "Make VR HWC DPI a configurable property" into oc-dr1-dev am:
281a0c26c0
am:
c0df4a029b
Change-Id: Ib1c6fabbb4962b0e8895b6252de63713311ad1d4
Kevin Schoedel [Fri, 23 Jun 2017 20:48:10 +0000 (20:48 +0000)]
Merge "Make VR HWC DPI a configurable property" into oc-dr1-dev
am:
281a0c26c0
Change-Id: I3ec8cc3bea80ab946c7576f9de2c470ace2fb72f
TreeHugger Robot [Fri, 23 Jun 2017 20:39:03 +0000 (20:39 +0000)]
Merge "Make VR HWC DPI a configurable property" into oc-dr1-dev
Courtney Goeltzenleuchter [Wed, 3 May 2017 22:36:55 +0000 (16:36 -0600)]
Convert tests to Android.bp
Test: make
adb shell stop; adb sync; adb shell start
- wait for device to finish
adb shell /data/nativetest/angeles/angeles
adb shell /data/nativetest/test-opengl-configdump/test-opengl-configdump
adb shell /data/nativetest/EGL_test/EGL_test
adb shell /data/nativetest/test-opengl-fillrate/test-opengl-fillrate
adb shell /data/nativetest/test-opengl-filter/test-opengl-filter 3
adb shell /data/nativetest/test-opengl-filter/test-opengl-filter 3 pbuffer
adb shell /data/nativetest/test-opengl-finish/test-opengl-finish
adb shell /data/nativetest/test-opengl-gl2_basic/test-opengl-gl2_basic
adb shell /data/nativetest/test-opengl-gl2_copyTexImage/test-opengl-gl2_copyTexImage
adb shell /data/nativetest/test-opengl-gl2_yuvtex/test-opengl-gl2_yuvtex
adb shell /data/nativetest/test-opengl-gl_basic/test-opengl-gl_basic
adb shell /data/nativetest/test-opengl-gl2_perf/test-opengl-gl2_perf
adb shell /data/nativetest/test-opengl-gl_yuvtex/test-opengl-gl_yuvtex
adb shell /data/nativetest/test-opengl-gralloc/test-opengl-gralloc
Bug:
37512442
Change-Id: I5d7b974333f485570304728d0572e251bb576f7e
TreeHugger Robot [Fri, 23 Jun 2017 20:03:02 +0000 (20:03 +0000)]
Merge "atrace: Enable cgroup tracing"
Steven Moreland [Fri, 23 Jun 2017 19:53:00 +0000 (19:53 +0000)]
Merge "IWYU RegionHelper += <limits>" am:
bbf3096e22 am:
f08008db9f am:
836513bfbf
am:
43c8b437ac
Change-Id: Ic27a21f069eefbc93ba66db1bcb9d6e73f76dd64
Steven Moreland [Fri, 23 Jun 2017 19:42:54 +0000 (19:42 +0000)]
Merge "IWYU RegionHelper += <limits>" am:
bbf3096e22 am:
f08008db9f
am:
836513bfbf
Change-Id: I164150132bd6518e52894823b10d108e86eed81b
Steven Moreland [Fri, 23 Jun 2017 19:36:01 +0000 (19:36 +0000)]
Merge "IWYU RegionHelper += <limits>" am:
bbf3096e22
am:
f08008db9f
Change-Id: Ida5d67d96a8c3eb87f25202872b2c30ed5b6c25e
Steven Moreland [Fri, 23 Jun 2017 19:23:34 +0000 (19:23 +0000)]
Merge "IWYU RegionHelper += <limits>"
am:
bbf3096e22
Change-Id: I9dd08e98eee2924554b623f755869fac35a80605
TreeHugger Robot [Fri, 23 Jun 2017 19:20:22 +0000 (19:20 +0000)]
Merge "EGL: Add EGL_GL_scrgb extension"