OSDN Git Service
Courtney Goeltzenleuchter [Wed, 19 Apr 2017 21:14:02 +0000 (15:14 -0600)]
Log error when exceeding MAX_LAYERS count
This is not a fix, but logging to make it clearer
what's happening.
Test: for i in {1..1000}; do cts-tradefed run commandAndExit cts-dev \
--abi armeabi-v7a --no-primary-abi-only --module \
CtsOpenGLTestCases -t android.opengl.cts.EglConfigTest#testEglConfigs ; \
done
May take a while to run.
The log message below indicates an issue, most likely leaking layers.
Once b/
3712178 is resolved, should not see this error.
AddClientLayer failed, mNumLayers (4096) >= MAX_LAYERS (4096)
Bug:
37121786
Also related to Bug:
30948621
Change-Id: I7ed931ae5433657bdc986edc66a9782ff08ed194
Vijay Venkatraman [Thu, 27 Apr 2017 18:10:17 +0000 (18:10 +0000)]
Merge "Change vndservicemanger's dep on libselinux to libselinux_vendor"
TreeHugger Robot [Thu, 27 Apr 2017 15:30:03 +0000 (15:30 +0000)]
Merge "Add new EGL colorspace extensions"
Nicolas Geoffray [Thu, 27 Apr 2017 13:11:39 +0000 (13:11 +0000)]
Merge "Update installd to new compiler filters." am:
f41404045a am:
d9cfce8e4d am:
685d22015a
am:
91582cd2a5
Change-Id: I17208bed9c2cc0ddacc81d093126e679ba0cd178
Nicolas Geoffray [Thu, 27 Apr 2017 13:05:57 +0000 (13:05 +0000)]
Merge "Update installd to new compiler filters." am:
f41404045a am:
d9cfce8e4d
am:
685d22015a
Change-Id: I6679c0a2c8ad13ce22d9ac877f394153b6fae433
Nicolas Geoffray [Thu, 27 Apr 2017 11:58:07 +0000 (11:58 +0000)]
Merge "Update installd to new compiler filters." am:
f41404045a
am:
d9cfce8e4d
Change-Id: I9ec817d7cd810eca9b9a41c388e05e7a2f86fe29
Nicolas Geoffray [Thu, 27 Apr 2017 11:51:14 +0000 (11:51 +0000)]
Merge "Update installd to new compiler filters."
am:
f41404045a
Change-Id: I1fb833977506a03f55c309bcda6458f1620304e8
Nicolas Geoffray [Thu, 27 Apr 2017 11:40:05 +0000 (11:40 +0000)]
Merge "Update installd to new compiler filters."
TreeHugger Robot [Thu, 27 Apr 2017 03:10:18 +0000 (03:10 +0000)]
Merge "Set default color mode for all displays"
Jaekyun Seok [Wed, 26 Apr 2017 22:16:27 +0000 (22:16 +0000)]
Merge "Newly create idmap only when it is outdated" into oc-dev am:
bb54a7df3a
am:
b148c4ba6b
Change-Id: I7018b71e8a710580822095c0b87853e0f877ecd8
Jaekyun Seok [Wed, 26 Apr 2017 22:04:27 +0000 (22:04 +0000)]
Merge "Newly create idmap only when it is outdated" into oc-dev
am:
bb54a7df3a
Change-Id: Ia6ffd48aeaf1b3d0de2294115d3769b82f950a51
TreeHugger Robot [Wed, 26 Apr 2017 21:50:15 +0000 (21:50 +0000)]
Merge "Newly create idmap only when it is outdated" into oc-dev
Courtney Goeltzenleuchter [Mon, 17 Apr 2017 23:31:29 +0000 (17:31 -0600)]
Add new EGL colorspace extensions
Test: make
Bug:
36258948
Change-Id: I8d47b1e4c5a6e5281aca25ddcd54157c5ffc1ead
Courtney Goeltzenleuchter [Tue, 25 Apr 2017 19:33:39 +0000 (13:33 -0600)]
Set default color mode for all displays
Virtual displays were not getting their color mode set
and that confused SurfaceFlinger when it was working with
virtual displays. Now set the display to the same default
color mode as the default display.
Test: b/
37102733
Should not see screen turn green when enabling
"simulate secondary displays" function.
bug:
37102733
Change-Id: I4d8f9e8d5c191623a286b03a05841bdeb20718b1
Dan Albert [Wed, 26 Apr 2017 19:36:17 +0000 (19:36 +0000)]
resolve merge conflicts of
7a78e14ec to oc-dev-plus-aosp
am:
8afbe27f81 -s ours
Change-Id: Ie529392ce562177cb0d4d841fa2bdf2d54f51e26
Dan Albert [Wed, 26 Apr 2017 19:27:04 +0000 (12:27 -0700)]
resolve merge conflicts of
7a78e14ec to oc-dev-plus-aosp
Change-Id: Icdd22fcf328935b7f5647270489539dab0ec4369
Dan Albert [Wed, 26 Apr 2017 18:50:42 +0000 (18:50 +0000)]
Merge "Add missing stdbool.h to sensor.h." am:
237249bbe1
am:
39565941e7
Change-Id: I6998be0bc0d3673045af44c008e621faaf884771
Dan Albert [Wed, 26 Apr 2017 18:47:15 +0000 (18:47 +0000)]
Merge "Add missing stdbool.h to sensor.h."
am:
237249bbe1
Change-Id: I09f91502b27dabb86e8eb0425dda55c2b071eef7
Dan Albert [Wed, 26 Apr 2017 18:34:14 +0000 (18:34 +0000)]
Merge "Add missing stdbool.h to sensor.h."
Dan Albert [Wed, 26 Apr 2017 18:33:31 +0000 (18:33 +0000)]
Merge "Add missing stdbool.h to sensor.h."
Peng Xu [Wed, 26 Apr 2017 18:23:45 +0000 (18:23 +0000)]
Merge "Sensor: Limit delay to maximum possible value before sending to HAL" into oc-dev am:
35c1e6960b
am:
91ce2645b6
Change-Id: I26f1d84f4b0ffd4457b36e864136e598a543b406
Peng Xu [Wed, 26 Apr 2017 17:55:59 +0000 (17:55 +0000)]
Merge "Sensor: Limit delay to maximum possible value before sending to HAL" into oc-dev
am:
35c1e6960b
Change-Id: I8bc0a1e2be4ff5b7135ba20170bf9d0faca0052c
Peng Xu [Wed, 26 Apr 2017 17:42:33 +0000 (17:42 +0000)]
Merge "Sensor: Limit delay to maximum possible value before sending to HAL" into oc-dev
Jaekyun Seok [Wed, 19 Apr 2017 02:01:38 +0000 (11:01 +0900)]
Newly create idmap only when it is outdated
For now, OverlayManagerService calls Installd.idmap() whenever a user
is changed, and then a idmap is re-generated even though there are no
changes on its target apk and overlay apk.
This CL is to avoid such unnecessary re-generation of idmap. Instead
only a group id will be updated when the idmap isn't outdated.
Test: building succeeded and tested on sailfish.
Bug:
37179531
Change-Id: Id726cbbc621bd64f2a329798b2ab5436f0c28d70
Chia-I Wu [Tue, 25 Apr 2017 23:06:01 +0000 (23:06 +0000)]
Merge "VR: fix libvr_hwc-hal build" into oc-dev am:
fe0cac23cb
am:
db9d6b04c3
Change-Id: Ic148650d73ea44d4af1de066be8e56fbfc9c75ae
Chia-I Wu [Tue, 25 Apr 2017 22:35:55 +0000 (22:35 +0000)]
Merge "VR: fix libvr_hwc-hal build" into oc-dev
am:
fe0cac23cb
Change-Id: I42608193138fe6de4c54a492ca76de01a3f87167
Robert Carr [Tue, 25 Apr 2017 22:17:44 +0000 (22:17 +0000)]
Merge "SurfaceFlinger: Fix destruction of relatively Z-ordered layers." into oc-dev am:
edcc0c28f4
am:
6fa90b1577
Change-Id: Iaf67f4476864bf9d1a012991be366186706b9be4
Corey Tabaka [Tue, 25 Apr 2017 22:17:28 +0000 (22:17 +0000)]
Merge changes from topic 'atrace-pdx' into oc-dev am:
961c83c865
am:
5c8e63db1d
Change-Id: I7d5f4521a66eb15730cb435dd29b110d348171b4
Dan Albert [Tue, 25 Apr 2017 19:24:28 +0000 (12:24 -0700)]
Add missing stdbool.h to sensor.h.
This got hacked into the NDK headers ages ago, but never got
upstreamed to the frameworks.
Test: make checkbuild
Bug: https://github.com/android-ndk/ndk/issues/370
Merged-In: Id38cbc96633c1c61de36996c2dd9e6c2331bd6e7
Change-Id: Id38cbc96633c1c61de36996c2dd9e6c2331bd6e7
Dan Albert [Tue, 25 Apr 2017 19:24:28 +0000 (12:24 -0700)]
Add missing stdbool.h to sensor.h.
This got hacked into the NDK headers ages ago, but never got
upstreamed to the frameworks.
Test: make checkbuild
Bug: https://github.com/android-ndk/ndk/issues/370
Change-Id: Id38cbc96633c1c61de36996c2dd9e6c2331bd6e7
Chia-I Wu [Tue, 25 Apr 2017 22:12:56 +0000 (22:12 +0000)]
Merge "VR: fix libvr_hwc-hal build" into oc-dev
Robert Carr [Tue, 25 Apr 2017 21:20:36 +0000 (21:20 +0000)]
Merge "SurfaceFlinger: Fix destruction of relatively Z-ordered layers." into oc-dev
am:
edcc0c28f4
Change-Id: I78b9c353b201b43888d469a6aa8919b2e1809f5c
TreeHugger Robot [Tue, 25 Apr 2017 20:49:33 +0000 (20:49 +0000)]
Merge "SurfaceFlinger: Fix destruction of relatively Z-ordered layers." into oc-dev
Corey Tabaka [Tue, 25 Apr 2017 20:12:08 +0000 (20:12 +0000)]
Merge changes from topic 'atrace-pdx' into oc-dev
am:
961c83c865
Change-Id: Iec4a030890bf1c9d88b4c220ea476fdc29ede0b9
TreeHugger Robot [Tue, 25 Apr 2017 19:59:47 +0000 (19:59 +0000)]
Merge changes from topic 'atrace-pdx' into oc-dev
* changes:
atrace: Poke PDX services using utility class.
libpdx: Add service poke logic to ServiceUtility.
Vijay Venkatraman [Tue, 25 Apr 2017 19:02:32 +0000 (12:02 -0700)]
Change vndservicemanger's dep on libselinux to libselinux_vendor
Bug:
37343404
Test: Build vndservicemanager with BOARD_VNDK_VERSION set
Change-Id: Ibdb0872a8f1342a533524eb43cfb6ec13a6d1d0c
Robert Carr [Tue, 25 Apr 2017 17:54:24 +0000 (10:54 -0700)]
SurfaceFlinger: Fix destruction of relatively Z-ordered layers.
We need to explicitly remove a layer from it's Z-order relative when
the layer is removed from compositing, and not rely on being the last
reference. In particular, at the time we are generating the list
of visible layers by traversing, any layer which had just been removed
will still be alive (but abandoned) with a ref in the previous list
of visible layers. So we will succeed in promotion, and copy it to the new
list. This way the layer achieves eternal life even after onRemoved is called.
Bug:
36693738
Test: Manual from BR
Change-Id: Ic6c3f64ceb0f603e7c0e51b136c23839858aa639
Alex Vakulenko [Tue, 25 Apr 2017 16:22:18 +0000 (16:22 +0000)]
Merge "Enable access to display/manager socket in surfaceflinger" into oc-dev am:
0e9dcf6657
am:
57fca565c5
Change-Id: I2338964543dd75c61d4c4f9fd91637124865c3b3
Alex Vakulenko [Tue, 25 Apr 2017 16:20:20 +0000 (16:20 +0000)]
Merge "Enable access to display/manager socket in surfaceflinger" into oc-dev
am:
0e9dcf6657
Change-Id: I67fd499a0fbd76bebc63e4b0eb08842ace5511f9
TreeHugger Robot [Tue, 25 Apr 2017 16:16:25 +0000 (16:16 +0000)]
Merge "Enable access to display/manager socket in surfaceflinger" into oc-dev
Courtney Goeltzenleuchter [Tue, 25 Apr 2017 15:57:47 +0000 (15:57 +0000)]
Merge "Dump EGL Extension list" into oc-dev am:
a774600064
am:
6e0800c893
Change-Id: I329aa2f40c29b95d999e7bee48cf67e0941093a0
Courtney Goeltzenleuchter [Tue, 25 Apr 2017 15:51:16 +0000 (15:51 +0000)]
Merge "Dump EGL Extension list" into oc-dev
am:
a774600064
Change-Id: I4062845d7a6ecc5d03f6a04da46476c2107c6db4
Courtney Goeltzenleuchter [Tue, 25 Apr 2017 15:46:44 +0000 (15:46 +0000)]
Merge "Dump EGL Extension list" into oc-dev
Ashutosh Joshi [Tue, 25 Apr 2017 12:25:49 +0000 (12:25 +0000)]
Merge "Clamp reported power for each sensor to 1 microAmp." into oc-dev am:
98a3f89115
am:
82e21408a5
Change-Id: I1212748494f7fc9fca9da6eb66f44f900c1c9b2e
Ashutosh Joshi [Tue, 25 Apr 2017 12:20:27 +0000 (12:20 +0000)]
Merge "Clamp reported power for each sensor to 1 microAmp." into oc-dev
am:
98a3f89115
Change-Id: I2cdb2a54f3afe743324c7e6bdd0002388fd7a3cd
Ashutosh Joshi [Tue, 25 Apr 2017 12:10:00 +0000 (12:10 +0000)]
Merge "Clamp reported power for each sensor to 1 microAmp." into oc-dev
Nicolas Geoffray [Tue, 25 Apr 2017 11:28:28 +0000 (12:28 +0100)]
Update installd to new compiler filters.
bug:
34715556
Test: build and boot aosp bullhead
Change-Id: If10fb8cdfe34f109d4caa1df56a49304025da553
Chia-I Wu [Thu, 20 Apr 2017 18:30:57 +0000 (11:30 -0700)]
VR: fix libvr_hwc-hal build
libhwcomposer-client was updated to use
android.hardware.graphics.mapper@2.0.
Bug:
37540361
Test: boots
Change-Id: Id9f94087a04890de95711c91ce9d5aa2f6c8e35d
Chris Forbes [Tue, 25 Apr 2017 04:27:17 +0000 (04:27 +0000)]
vr: Adjust for libui gralloc flags change am:
73feb06766
am:
99657cefb2
Change-Id: I032dcbf8c7df2a0911a13434f0d83f15d04767cf
Chris Forbes [Tue, 25 Apr 2017 04:27:03 +0000 (04:27 +0000)]
gui: Adjust for libui gralloc flags change am:
f3ef3eab3a
am:
e7b3eb2e8a
Change-Id: I5dc60fd5b3957c70fbf220cbc0c076cd07bc021f
Chris Forbes [Tue, 25 Apr 2017 04:26:50 +0000 (04:26 +0000)]
nativewindow: Adjust for libui gralloc flags change am:
d410630206
am:
8ce6238125
Change-Id: Id1ac0f299c98ef41920ef3f880c4be38b79090a0
Chris Forbes [Tue, 25 Apr 2017 04:25:26 +0000 (04:25 +0000)]
ui: Rework GraphicBuffer + Allocator for 64bit usage am:
82c0498438
am:
7f7311e337
Change-Id: I99d8d6cf184857d51669bfc5161606879a709a61
Chris Forbes [Tue, 25 Apr 2017 04:20:23 +0000 (04:20 +0000)]
vr: Adjust for libui gralloc flags change
am:
73feb06766
Change-Id: Ife77c3fbf4ee59c3213b8abb90480eaacbc3d2dd
Chris Forbes [Tue, 25 Apr 2017 04:20:13 +0000 (04:20 +0000)]
gui: Adjust for libui gralloc flags change
am:
f3ef3eab3a
Change-Id: Ic5a747c5f5cdf5d5bb4a2d9a08df55bdd72384c3
Chris Forbes [Tue, 25 Apr 2017 04:20:02 +0000 (04:20 +0000)]
nativewindow: Adjust for libui gralloc flags change
am:
d410630206
Change-Id: Ieee2205e45cc952b3b48d584fbba2dc944abeed3
Chris Forbes [Tue, 25 Apr 2017 04:19:47 +0000 (04:19 +0000)]
ui: Rework GraphicBuffer + Allocator for 64bit usage
am:
82c0498438
Change-Id: I3d036f07a8ee8a50aebeea700bc43933eb349443
Chris Forbes [Thu, 20 Apr 2017 00:16:48 +0000 (17:16 -0700)]
vr: Adjust for libui gralloc flags change
Change-Id: I24dbe407ad9139ba1d206b9074c7c507537d198c
Bug: b/
33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
Chris Forbes [Thu, 20 Apr 2017 19:43:28 +0000 (12:43 -0700)]
gui: Adjust for libui gralloc flags change
Change-Id: I9f73a1753f9e991eb3a7f0a005c3ab240f0a38b4
Bug: b/
33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
Chris Forbes [Thu, 20 Apr 2017 19:43:04 +0000 (12:43 -0700)]
nativewindow: Adjust for libui gralloc flags change
Change-Id: I451f045b42d1e3e3bfc35f1e30f27dedc35d4da3
Bug: b/
33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
Chris Forbes [Wed, 19 Apr 2017 21:29:54 +0000 (14:29 -0700)]
ui: Rework GraphicBuffer + Allocator for 64bit usage
Removes gralloc1-style flags, and replaces with HIDL-style single 64bit
usage. Internal storage of the usage is still 32bit; to be addressed
with a future change.
Change-Id: I60062208cbb06bc8cf6c293e7c7e1530c1147912
Bug: b/
33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
Luke Song [Mon, 24 Apr 2017 22:51:41 +0000 (22:51 +0000)]
Merge "Remove/Cleanup Obselete References" into oc-dev am:
693aa74db1
am:
8dfcec80d1
Change-Id: I01a5eb9bdcadf4e6e0b02bb52eb9744582fc702e
Luke Song [Mon, 24 Apr 2017 19:38:36 +0000 (19:38 +0000)]
Merge "Remove/Cleanup Obselete References" into oc-dev
am:
693aa74db1
Change-Id: Ic7d2192bf1b27a214b4a3d1d5d52e74004fd64d5
Luke Song [Sat, 22 Apr 2017 17:30:55 +0000 (17:30 +0000)]
Merge "Remove/Cleanup Obselete References" into oc-dev
Chia-I Wu [Sat, 22 Apr 2017 09:13:42 +0000 (09:13 +0000)]
Merge "dumpstate: add graphics composer to hal_interfaces_to_dump" into oc-dev am:
5a0cb643da
am:
9e078a6bf9
Change-Id: I6c3021c19b17153991053f32df48ddb269272fc0
Chia-I Wu [Sat, 22 Apr 2017 09:07:04 +0000 (09:07 +0000)]
Merge "dumpstate: add graphics composer to hal_interfaces_to_dump" into oc-dev
am:
5a0cb643da
Change-Id: I446ff2f8b709c9f4d5de3604f6d43756529501ae
TreeHugger Robot [Sat, 22 Apr 2017 09:00:07 +0000 (09:00 +0000)]
Merge "dumpstate: add graphics composer to hal_interfaces_to_dump" into oc-dev
Chia-I Wu [Thu, 20 Apr 2017 21:31:50 +0000 (14:31 -0700)]
dumpstate: add graphics composer to hal_interfaces_to_dump
Bug:
37152880
Test: adb shell dumpstate
Change-Id: Id9679d0f02350bc4f51b11b250c7703703dbdfe7
TreeHugger Robot [Fri, 21 Apr 2017 23:06:52 +0000 (23:06 +0000)]
Merge "sensorservice: Android.bp -> Android.mk"
Jeff Sharkey [Fri, 21 Apr 2017 20:21:08 +0000 (20:21 +0000)]
Merge "Fix external cache and secondary user bugs." into oc-dev am:
c419dc56ac
am:
31725a7409
Change-Id: I3a8d07b94d5cf410b628c3f3f66a1b94e0cb6e1b
Jeff Sharkey [Fri, 21 Apr 2017 20:11:05 +0000 (20:11 +0000)]
Merge "Fix external cache and secondary user bugs." into oc-dev
am:
c419dc56ac
Change-Id: I9ef878cecaf84e577a24aeba1735d62c9541a2b4
Steven Moreland [Fri, 21 Apr 2017 20:08:34 +0000 (13:08 -0700)]
sensorservice: Android.bp -> Android.mk
Test: links
Change-Id: Ibe409076b4cdbf45d8477b466dbb9442362863c7
Jeff Sharkey [Fri, 21 Apr 2017 20:01:36 +0000 (20:01 +0000)]
Merge "Fix external cache and secondary user bugs." into oc-dev
Mike Stroyan [Fri, 21 Apr 2017 19:21:53 +0000 (19:21 +0000)]
Merge "Defer surfaceflinger composition until data latch" into oc-dev am:
09e897b415
am:
d9d704766f
Change-Id: I520d9107f8874612e7c32e115cbdf126f0508126
Mike Stroyan [Fri, 21 Apr 2017 19:06:14 +0000 (19:06 +0000)]
Merge "Defer surfaceflinger composition until data latch" into oc-dev
am:
09e897b415
Change-Id: I39e32d9a85150174fafc79c8bc39310dc71bd069
Jesse Hall [Fri, 21 Apr 2017 19:05:47 +0000 (19:05 +0000)]
Merge "Fix AHardwareBuffer 10:10:10:2 format" into oc-dev am:
ec37174133
am:
d0b2562f71
Change-Id: I85624ec5e875f366c10681d8c60946de449179b7
Mike Stroyan [Fri, 21 Apr 2017 18:59:49 +0000 (18:59 +0000)]
Merge "Defer surfaceflinger composition until data latch" into oc-dev
Jesse Hall [Fri, 21 Apr 2017 18:53:09 +0000 (18:53 +0000)]
Merge "Fix AHardwareBuffer 10:10:10:2 format" into oc-dev
am:
ec37174133
Change-Id: I1dc48784cf8b29d2c5f5199230d34d16c4a5ecbb
TreeHugger Robot [Fri, 21 Apr 2017 18:38:19 +0000 (18:38 +0000)]
Merge "Fix AHardwareBuffer 10:10:10:2 format" into oc-dev
Mike Stroyan [Thu, 20 Apr 2017 18:10:48 +0000 (12:10 -0600)]
Defer surfaceflinger composition until data latch
If layer data is not yet ready, latchBuffer will return an empty region.
SurfaceFlinger::handlePageFlip will now check if any layer has a queued
frame which succeeded in latching data.
If no new frame is latched, handlePageFlip will return false.
That will defer refresh until the next vsync.
That reduces HWC and GPU load, improving framerates.
It prevents dEQP tests from timing out on some devices.
Test: dEQP-VK.wsi.android.incremental_present.scale_down.fifo.reference
Bug:
37439915
Change-Id: Id46c82f79953f3a147af77bb0e8e81a395c606b3
Luke Song [Fri, 24 Mar 2017 21:17:31 +0000 (14:17 -0700)]
Remove/Cleanup Obselete References
Bug:
36039686
Bug:
36040117
Bug:
36039685
Bug:
36040550
Test: Build
Change-Id: Ifd5ae90138e39d0a14c6a5a8198a9145f74ec8f6
(cherry picked from commit
8126b9df8987fd9959eab1ae76620c343c32f4fc)
Okan Arikan [Fri, 21 Apr 2017 08:18:57 +0000 (08:18 +0000)]
Merge "Pose flicker fix on some devices" into oc-dev am:
5da2188e4c
am:
1c8b3073f6
Change-Id: Ice8603e580a34d3d99ee404c9aabbe2fb1ad0960
Okan Arikan [Fri, 21 Apr 2017 08:16:29 +0000 (08:16 +0000)]
Merge "Pose flicker fix on some devices" into oc-dev
am:
5da2188e4c
Change-Id: I1e38b1030b486c1f8f641415d343bddb560d746d
TreeHugger Robot [Fri, 21 Apr 2017 08:09:37 +0000 (08:09 +0000)]
Merge "Pose flicker fix on some devices" into oc-dev
Steven Moreland [Fri, 21 Apr 2017 02:11:38 +0000 (02:11 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp"" am:
c6a6fd0516 am:
4fe57dd57d am:
e9c068b263 -s ours
am:
5f123b446a -s ours
Change-Id: Iad89e5dc648d5154d577173a9faf0667a7d6e590
Steven Moreland [Fri, 21 Apr 2017 02:06:35 +0000 (02:06 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp"" am:
c6a6fd0516 am:
4fe57dd57d
am:
e9c068b263 -s ours
Change-Id: I99468607352a9102923cef48b475860a602942f2
Steven Moreland [Fri, 21 Apr 2017 02:05:17 +0000 (02:05 +0000)]
Revert "resolve merge conflicts of
03e80b462 to oc-dev-plus-aosp"
am:
5232d6d927
Change-Id: Idfa48f492017e11edc79c110cd99eb12ec527025
Steven Moreland [Fri, 21 Apr 2017 02:03:35 +0000 (02:03 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp"" am:
c6a6fd0516
am:
4fe57dd57d
Change-Id: Ie46dfeb8c57c4edeedbf474a7f5cb414e3ab686e
Steven Moreland [Fri, 21 Apr 2017 02:01:04 +0000 (02:01 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp""
am:
c6a6fd0516
Change-Id: Ic5c3654b19f84b12add62a2ec127fb9eda7654a4
Steven Moreland [Fri, 21 Apr 2017 01:57:34 +0000 (01:57 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp""
Steven Moreland [Fri, 21 Apr 2017 01:57:19 +0000 (01:57 +0000)]
Revert "(lib)?sensorservice: Android.mk -> Android.bp"
This reverts commit
f1b07d51ed6a11a0446115934fb75c22a1badb87.
Bad internal merge and other errors.
Change-Id: If9b812916223773ee98354d0805626cf759355fd
Merged-In: Ib3a3f249c278be582de04a583e18de3c0e502d5e
Steven Moreland [Fri, 21 Apr 2017 01:55:08 +0000 (01:55 +0000)]
Revert "resolve merge conflicts of
03e80b462 to oc-dev-plus-aosp"
This reverts commit
40d89431dbad9c7f5820ddbe21dd8a532f58f0f5.
Reason for revert: didn't delete mk
Change-Id: Ib3a3f249c278be582de04a583e18de3c0e502d5e
Steven Moreland [Fri, 21 Apr 2017 01:03:31 +0000 (01:03 +0000)]
resolve merge conflicts of
03e80b462 to oc-dev-plus-aosp
am:
40d89431db
Change-Id: Iaa9b4f107451c4936025231b6eeb0d23454c1d36
Steven Moreland [Fri, 21 Apr 2017 00:42:43 +0000 (17:42 -0700)]
resolve merge conflicts of
03e80b462 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3f41140bf5f10e03667a9e36c29df0d3e90d7bb0
Steven Moreland [Fri, 21 Apr 2017 00:09:25 +0000 (00:09 +0000)]
Merge "(lib)?sensorservice: Android.mk -> Android.bp" am:
9a33cae051
am:
e8d1bd4f67
Change-Id: I7027e846ac5c62e5df1341bafd1598c3c9957c60
Steven Moreland [Fri, 21 Apr 2017 00:06:55 +0000 (00:06 +0000)]
Merge "(lib)?sensorservice: Android.mk -> Android.bp"
am:
9a33cae051
Change-Id: I453692e9058d54edfb8777371814f504d3886ba0
Steven Moreland [Fri, 21 Apr 2017 00:03:10 +0000 (00:03 +0000)]
Merge "(lib)?sensorservice: Android.mk -> Android.bp"
Steven Moreland [Thu, 20 Apr 2017 22:56:38 +0000 (15:56 -0700)]
(lib)?sensorservice: Android.mk -> Android.bp
Test: links
Change-Id: I2ddab32c12bf07044416f983b5cf0ae19cc12ba0
Aniroop Mathur [Wed, 1 Jun 2016 16:47:05 +0000 (22:17 +0530)]
Sensor: Limit delay to maximum possible value before sending to HAL
Currently, all hals/drivers of different manufacturers/vendors have to add check
to modify delay value to maximum possible value if application requests for
delay greater than maximum possible value. Instead of putting this common check
in all different types of drivers/hals, it is best to put it in framework layer only.
For example:
If a sensor has maximum delay capability of 200 ms and application requests for
delay of 1 second then sensor should run at 200 ms and not 1 second. This is
checked by cts application too like in testAccelerometer_1Hz test case.
Test: compile
Bug:
37543280
Change-Id: Ib921056659ea442ed854b69321d8b2ba0e319302
Signed-off-by: Aniroop Mathur <a.mathur@samsung.com>
Alex Vakulenko [Thu, 20 Apr 2017 21:25:01 +0000 (14:25 -0700)]
Enable access to display/manager socket in surfaceflinger
DisplayManager interface is needed by VrCore. Currently the entry
point for that service is not accessible outside of `graphics` user
group which VrCore is not part of. We need to allow access to that
socket (and subsequently use selinux to fine-tune access rights
in the future).
Bug:
37486608
Test: `lunch sailfish-eng && m -j32` works and device boots
Change-Id: I1d1b545ba85aa6700b409fbbdacc330b8302049b
Chia-I Wu [Thu, 20 Apr 2017 19:22:04 +0000 (19:22 +0000)]
Merge "libui: log an error on allocation failure" into oc-dev am:
e937eb866d
am:
73c9215562
Change-Id: Icd329a58d4e4eaf7c6175ffdf2c5b476526fc4aa
OSDN Git Service
