OSDN Git Service

android-x86/frameworks-native.git
7 years agoReplace surfaceflinger protobufs with protobuf-lite
Colin Cross [Wed, 26 Oct 2016 19:52:53 +0000 (12:52 -0700)]
Replace surfaceflinger protobufs with protobuf-lite

Use lite protobufs for surfaceflinger to remove dependency on
libprotobuf-cpp-full, which will be removed from the platform.

Bug: 32417805
Test: builds
Change-Id: Ie27b253a2f6c1b296c4ae7c7cb056cd3c4c0dde6

7 years agoMerge "[binder]: Correct the index for getReturnString" am: a340838895 am: 3a3ed21bac...
Colin Cross [Mon, 24 Oct 2016 18:13:54 +0000 (18:13 +0000)]
Merge "[binder]: Correct the index for getReturnString" am: a340838895 am: 3a3ed21bac am: 218d4e6ce5
am: 22e91a5b8f

Change-Id: Ief9ebb3d80d134d964a3011141da0196c16f87fd

7 years agoMerge "[binder]: Correct the index for getReturnString" am: a340838895 am: 3a3ed21bac
Colin Cross [Mon, 24 Oct 2016 18:09:54 +0000 (18:09 +0000)]
Merge "[binder]: Correct the index for getReturnString" am: a340838895 am: 3a3ed21bac
am: 218d4e6ce5

Change-Id: Ibbe6406b6feff62dce7193c13de0bbaacceb48a8

7 years agoMerge "[binder]: Correct the index for getReturnString" am: a340838895
Colin Cross [Mon, 24 Oct 2016 18:06:24 +0000 (18:06 +0000)]
Merge "[binder]: Correct the index for getReturnString" am: a340838895
am: 3a3ed21bac

Change-Id: I155907b463d85dee5327c1b1df47be6d6c5cc3c9

7 years agoMerge "[binder]: Correct the index for getReturnString"
Colin Cross [Mon, 24 Oct 2016 18:02:53 +0000 (18:02 +0000)]
Merge "[binder]: Correct the index for getReturnString"
am: a340838895

Change-Id: Ide173ea019cceaba9eee1c25edf9fea75acc6caa

7 years agoMerge "[binder]: Correct the index for getReturnString"
Colin Cross [Mon, 24 Oct 2016 17:58:14 +0000 (17:58 +0000)]
Merge "[binder]: Correct the index for getReturnString"

7 years agoDO NOT MERGE. Added a is_zipping() function. am: 03974984bf am: 40e091cd8f
Felipe Leme [Fri, 21 Oct 2016 23:59:18 +0000 (23:59 +0000)]
DO NOT MERGE. Added a is_zipping() function. am: 03974984bf am: 40e091cd8f
am: 7a7c28a4aa  -s ours

Change-Id: Iaeb9aea29bb5b11a49eb55af3eb0d9238bba038b

7 years agoDO NOT MERGE. Added a is_zipping() function. am: 03974984bf
Felipe Leme [Fri, 21 Oct 2016 23:56:18 +0000 (23:56 +0000)]
DO NOT MERGE. Added a is_zipping() function. am: 03974984bf
am: 40e091cd8f

Change-Id: Ia9e559632ea3c5e37063e1433c2a7928f8313625

7 years agoDO NOT MERGE. Added a is_zipping() function.
Felipe Leme [Fri, 21 Oct 2016 23:53:47 +0000 (23:53 +0000)]
DO NOT MERGE. Added a is_zipping() function.
am: 03974984bf

Change-Id: Ib14224bf42315b3b1633662fac1f88610a824296

7 years agoMerge changes I46ec4bca,I64c00f3b
TreeHugger Robot [Fri, 21 Oct 2016 19:34:20 +0000 (19:34 +0000)]
Merge changes I46ec4bca,I64c00f3b

* changes:
  Sets dumpstate version using system properties.
  Fixed variable names according to Google C++ style.

7 years agoDO NOT MERGE. Added a is_zipping() function.
Felipe Leme [Fri, 21 Oct 2016 18:38:26 +0000 (11:38 -0700)]
DO NOT MERGE. Added a is_zipping() function.

BUG: 32219165
Fixes: 32335112
Change-Id: I2bc630f9c840ccd3a2e0474ed16a766e8a405ad8

7 years agoresolve merge conflicts of 91cc63a to master
Mark Salyzyn [Fri, 21 Oct 2016 18:31:39 +0000 (11:31 -0700)]
resolve merge conflicts of 91cc63a to master

Test: None
Bug: 31750617
Change-Id: Iace66f74cc0624064e536ef98707701f8e060701

7 years agoMerge "dumpstate: Use private interfaces for buffer size properties" am: 430b3667ec
Mark Salyzyn [Fri, 21 Oct 2016 18:16:22 +0000 (18:16 +0000)]
Merge "dumpstate: Use private interfaces for buffer size properties" am: 430b3667ec
am: 439dbe3bc3

Change-Id: Ia996de428a869552937ec690b4d02af7611c2bc1

7 years agoMerge "dumpstate: Use private interfaces for buffer size properties"
Mark Salyzyn [Fri, 21 Oct 2016 18:08:51 +0000 (18:08 +0000)]
Merge "dumpstate: Use private interfaces for buffer size properties"
am: 430b3667ec

Change-Id: I150663d5108340f1434f8ec48eb6cd9d4722603f

7 years agoMerge "dumpstate: Use private interfaces for buffer size properties"
Mark Salyzyn [Fri, 21 Oct 2016 18:02:12 +0000 (18:02 +0000)]
Merge "dumpstate: Use private interfaces for buffer size properties"

7 years ago[binder]: Correct the index for getReturnString
songjinshi [Tue, 18 Oct 2016 13:05:56 +0000 (21:05 +0800)]
[binder]: Correct the index for getReturnString

The cmd code can not as the index drectly.

Change-Id: Icddad46faef7a77acbd7edf118c081ac10501f47
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
7 years agoSets dumpstate version using system properties.
Felipe Leme [Thu, 20 Oct 2016 23:48:00 +0000 (16:48 -0700)]
Sets dumpstate version using system properties.

Android N introduced a '-V' argument to change dumpstate's version, but
such argument can only be used when running dumpstate directly (as
root).
This CL uses a system property instead (dumpstate.version), so different
versions can be used while taking bugreports.

It also introduces a '-v' argument line to display the dumpstate header,
and removes the redundant dry_run check from _dump_file_from_fd().

Test: DumpstateTest passes
Change-Id: I46ec4bca133d16d8431358bb9f16eb89bb082be1

7 years agoFixed variable names according to Google C++ style.
Felipe Leme [Thu, 20 Oct 2016 22:10:33 +0000 (15:10 -0700)]
Fixed variable names according to Google C++ style.

Trivia question: what do you get when Java developers refactor C into C++?
Anser: a_bigMess

BUG: 26379932

Test: DumpstateTest passes

Change-Id: I64c00f3b5953f077fb646cdc45a1656060a4b46e

7 years agodumpstate: Use private interfaces for buffer size properties
Mark Salyzyn [Tue, 27 Sep 2016 21:55:27 +0000 (14:55 -0700)]
dumpstate: Use private interfaces for buffer size properties

Used to estimate the timeout to be applied to the logcat command.
This transition represents some technical debt and optimization.

Test: collect bugreport and confirm logcat output
Bug: 31750617
Bug: 21555259
Change-Id: I512b969a4a796fce468907494814315e30c5299d

7 years agoMerge "Add licenses to ndk_headers." am: 8c9cd8a215 am: 1bef51ae50
Dan Albert [Thu, 20 Oct 2016 22:31:49 +0000 (22:31 +0000)]
Merge "Add licenses to ndk_headers." am: 8c9cd8a215 am: 1bef51ae50
am: 494979faf9

Change-Id: I8df2571df3b2a7fd065ce3c1d98febebba76bfe2

7 years agoMerge "Add licenses to ndk_headers." am: 8c9cd8a215
Dan Albert [Thu, 20 Oct 2016 22:24:07 +0000 (22:24 +0000)]
Merge "Add licenses to ndk_headers." am: 8c9cd8a215
am: 1bef51ae50

Change-Id: I862f1bbe3552645cf7a1437d986c3620a1bdb0f5

7 years agoMerge "Add licenses to ndk_headers."
Dan Albert [Thu, 20 Oct 2016 22:16:56 +0000 (22:16 +0000)]
Merge "Add licenses to ndk_headers."
am: 8c9cd8a215

Change-Id: I6a49ab856d6f52597067be0df5e34b9459efdb33

7 years agoMerge "Add licenses to ndk_headers."
Treehugger Robot [Thu, 20 Oct 2016 22:12:39 +0000 (22:12 +0000)]
Merge "Add licenses to ndk_headers."

7 years agoMerge "Refactor zip functions and state into Dumpstate class."
TreeHugger Robot [Thu, 20 Oct 2016 20:08:03 +0000 (20:08 +0000)]
Merge "Refactor zip functions and state into Dumpstate class."

7 years agoMerge "Minor dumpstate refactorings:"
TreeHugger Robot [Thu, 20 Oct 2016 18:25:53 +0000 (18:25 +0000)]
Merge "Minor dumpstate refactorings:"

7 years agoAdd licenses to ndk_headers.
Dan Albert [Thu, 20 Oct 2016 17:14:30 +0000 (10:14 -0700)]
Add licenses to ndk_headers.

Test: make ndk
Bug: None
Change-Id: Ia113ea42b1d62d87dfbb2fc456428c7db50a98f1

7 years agoMerge "Fix log function for potential overflow" am: 2e5c7798e1 am: 10155def9a
Wei Wang [Thu, 20 Oct 2016 17:05:56 +0000 (17:05 +0000)]
Merge "Fix log function for potential overflow" am: 2e5c7798e1 am: 10155def9a
am: 0b0f69aecb

Change-Id: Ie45cdddbf69261564c11cd2c8c781ef2391e500e

7 years agoMerge "Fix log function for potential overflow" am: 2e5c7798e1
Wei Wang [Thu, 20 Oct 2016 16:57:24 +0000 (16:57 +0000)]
Merge "Fix log function for potential overflow" am: 2e5c7798e1
am: 10155def9a

Change-Id: Ia91d711168bf9e69c583b1a933d69de94916b449

7 years agoRefactor zip functions and state into Dumpstate class.
Felipe Leme [Sat, 15 Oct 2016 01:06:47 +0000 (18:06 -0700)]
Refactor zip functions and state into Dumpstate class.

BUG: 26379932

Test: DumpstateTest passes

Change-Id: I8525b81c9239287a108aa6222048fa6171ddb15d

7 years agoMerge "Fix log function for potential overflow"
Wei Wang [Thu, 20 Oct 2016 16:49:03 +0000 (16:49 +0000)]
Merge "Fix log function for potential overflow"
am: 2e5c7798e1

Change-Id: I17a6c6a035e6e85777d0f14db819452d770856ae

7 years agoMerge "Fix log function for potential overflow"
Wei Wang [Thu, 20 Oct 2016 16:41:20 +0000 (16:41 +0000)]
Merge "Fix log function for potential overflow"

7 years agoFix log function for potential overflow
Wei Wang [Wed, 19 Oct 2016 17:23:59 +0000 (10:23 -0700)]
Fix log function for potential overflow

On LP64 system, unsigned long can be 64bit
Also clean out unused static variables.

Test: flash on ARM64 device
Bug: 32181382
Change-Id: I44b7ea8a6588c475a3979d7bddeb08da7f54c27a

7 years agoMerge "Fix log function for potential overflow"
Wei Wang [Thu, 20 Oct 2016 03:48:22 +0000 (03:48 +0000)]
Merge "Fix log function for potential overflow"

7 years agoFix log function for potential overflow
Wei Wang [Wed, 19 Oct 2016 17:23:59 +0000 (10:23 -0700)]
Fix log function for potential overflow

On LP64 system, unsigned long can be 64bit
Also clean out unused static variables.

Test: flash on ARM64 device
Bug: 32181382
Change-Id: I44b7ea8a6588c475a3979d7bddeb08da7f54c27a

7 years agoMerge "Delete RenderEngine path for OpenGL ES 1.0/1.1"
Fabien Sanglard [Wed, 19 Oct 2016 22:46:51 +0000 (22:46 +0000)]
Merge "Delete RenderEngine path for OpenGL ES 1.0/1.1"

7 years agoIOMX: adding OMX_IndexParamMaxFrameDurationForBitrateControl
Chong Zhang [Thu, 13 Oct 2016 00:09:48 +0000 (17:09 -0700)]
IOMX: adding OMX_IndexParamMaxFrameDurationForBitrateControl

Also adding end tag for index groups where we explictly validate.

bug: 31399200
Change-Id: I164ea60258bae809dd4ff389f2480add926a9c4b

7 years agoMerge "Rely on the platform -std default."
Elliott Hughes [Wed, 19 Oct 2016 15:26:11 +0000 (15:26 +0000)]
Merge "Rely on the platform -std default."

7 years agoservices: surfaceflinger: ASAN fix am: 1d3df546d5 am: ff06017cfe
Steve Pfetsch [Wed, 19 Oct 2016 05:08:49 +0000 (05:08 +0000)]
services: surfaceflinger: ASAN fix am: 1d3df546d5 am: ff06017cfe
am: 409c087ffe

Change-Id: Ia0a821a314c9bc5582cef8f434a77115599263e2

7 years agoservices: surfaceflinger: ASAN fix am: 1d3df546d5
Steve Pfetsch [Wed, 19 Oct 2016 05:01:18 +0000 (05:01 +0000)]
services: surfaceflinger: ASAN fix am: 1d3df546d5
am: ff06017cfe

Change-Id: Ie1f5418312cffc6b1a1ec9a7fd0194babaf9d6d9

7 years agoservices: surfaceflinger: ASAN fix
Steve Pfetsch [Wed, 19 Oct 2016 04:53:17 +0000 (04:53 +0000)]
services: surfaceflinger: ASAN fix
am: 1d3df546d5

Change-Id: If0447f27ab0a1c3033b0a87fc8426f53c2a82ac5

7 years agoservices: surfaceflinger: ASAN fix
Steve Pfetsch [Fri, 30 Sep 2016 00:16:29 +0000 (17:16 -0700)]
services: surfaceflinger: ASAN fix

Move layer removal to the main thread, while the display is on.

Bug: 30281222
Change-Id: Id9f956c1e626819734868340e7fa12abf257b702

7 years agoMerge "Convert to Android.bp" am: 99de09fe7f -s ours am: cc3c973f5f -s ours
Dan Willemsen [Tue, 18 Oct 2016 23:50:46 +0000 (23:50 +0000)]
Merge "Convert to Android.bp" am: 99de09fe7f  -s ours am: cc3c973f5f  -s ours
am: c438a959e1  -s ours

Change-Id: Id252ea9d5bce15fe7ca3c4a52a04113664b4db24

7 years agoMerge "Convert to Android.bp" am: 99de09fe7f -s ours
Dan Willemsen [Tue, 18 Oct 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Convert to Android.bp" am: 99de09fe7f  -s ours
am: cc3c973f5f  -s ours

Change-Id: I825715a956f44a0b4371a1526a054c05fac05326

7 years agoMerge "Convert to Android.bp"
Dan Willemsen [Tue, 18 Oct 2016 23:36:42 +0000 (23:36 +0000)]
Merge "Convert to Android.bp"
am: 99de09fe7f  -s ours

Change-Id: I16fbbe0cdeffe80b7b92148f696ec2db848cd4cf

7 years agoMerge "Convert to Android.bp"
Dan Willemsen [Tue, 18 Oct 2016 23:26:08 +0000 (23:26 +0000)]
Merge "Convert to Android.bp"

7 years agoConvert to Android.bp
Dan Willemsen [Tue, 4 Oct 2016 06:56:51 +0000 (23:56 -0700)]
Convert to Android.bp

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

Test: mmma -j frameworks/native/{libs/gui,opengl/libs}
Change-Id: I90b4e299ebd2a38afb6642bc242d4ad5424fb901
Merged-In: I90b4e299ebd2a38afb6642bc242d4ad5424fb901

7 years agoConvert to Android.bp am: 3106c1c4fc
Dan Willemsen [Tue, 18 Oct 2016 21:06:50 +0000 (21:06 +0000)]
Convert to Android.bp am: 3106c1c4fc
am: 2d4e12f147

Change-Id: Iaed7fa8aa07d9bbcf3614e6a0ec859d623997dbc

7 years agoConvert to Android.bp
Dan Willemsen [Tue, 18 Oct 2016 20:59:48 +0000 (20:59 +0000)]
Convert to Android.bp
am: 3106c1c4fc

Change-Id: I4e0b4bbe420201473a345ed19eaee753f45a4b80

7 years agoMerge "Finish implementation of "cmd"."
Dianne Hackborn [Tue, 18 Oct 2016 20:20:44 +0000 (20:20 +0000)]
Merge "Finish implementation of "cmd"."

7 years agoConvert to Android.bp
Dan Willemsen [Tue, 4 Oct 2016 06:56:51 +0000 (23:56 -0700)]
Convert to Android.bp

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

Test: mmma -j frameworks/native/{libs/gui,opengl/libs}
Change-Id: I90b4e299ebd2a38afb6642bc242d4ad5424fb901

7 years agoMerge "Fix surfaceflinger file descriptor leak" am: af2fbb0ccc am: ee87482e6d
Fabien Sanglard [Tue, 18 Oct 2016 19:07:08 +0000 (19:07 +0000)]
Merge "Fix surfaceflinger file descriptor leak" am: af2fbb0ccc am: ee87482e6d
am: 735d32406d

Change-Id: Iadc2fdb10b6648e36d304dd22fd1119a3b03d728

7 years agoMerge "Fix surfaceflinger file descriptor leak" am: af2fbb0ccc
Fabien Sanglard [Tue, 18 Oct 2016 18:58:42 +0000 (18:58 +0000)]
Merge "Fix surfaceflinger file descriptor leak" am: af2fbb0ccc
am: ee87482e6d

Change-Id: I87f37b1ecc15b0b7800c0269f5a27df59125c73f

7 years agoMerge "Fix surfaceflinger file descriptor leak"
Fabien Sanglard [Tue, 18 Oct 2016 18:51:46 +0000 (18:51 +0000)]
Merge "Fix surfaceflinger file descriptor leak"
am: af2fbb0ccc

Change-Id: If21d062e144dd13064c0c3e8021523a8bf20b864

7 years agoMerge "Fix surfaceflinger file descriptor leak"
Fabien Sanglard [Tue, 18 Oct 2016 18:41:44 +0000 (18:41 +0000)]
Merge "Fix surfaceflinger file descriptor leak"

7 years agoMerge changes I5d907c33,Ibce48cd2 into cw-f-dev am: a34aade39a
Matthew Bouyack [Tue, 18 Oct 2016 17:23:10 +0000 (17:23 +0000)]
Merge changes I5d907c33,Ibce48cd2 into cw-f-dev am: a34aade39a
am: 6ff15b2ba4

Change-Id: Ia024561f97d6a674ce1cf31ec58f423b6438cb70

7 years agoIn SurfaceFlinger, test fence before merging am: 377c203375
Matthew Bouyack [Tue, 18 Oct 2016 17:23:01 +0000 (17:23 +0000)]
In SurfaceFlinger, test fence before merging am: 377c203375
am: 29cacbe8fe

Change-Id: I2daf0fe8d3e6c25cd41e46940137842179da1e6e

7 years agolibui: Change hasSignaled to return optional<bool> am: 6db42ac36e
Dan Stoza [Tue, 18 Oct 2016 17:22:49 +0000 (17:22 +0000)]
libui: Change hasSignaled to return optional<bool> am: 6db42ac36e
am: f873bd4d31

Change-Id: I5fd6b5d7c46d620a7c5b526098d975273888f2a1

7 years agoSensors: Add WRIST_TILT_GESTURE as wake sensor am: 5e7f79bf29
Nick Vaccaro [Tue, 18 Oct 2016 17:22:37 +0000 (17:22 +0000)]
Sensors: Add WRIST_TILT_GESTURE as wake sensor am: 5e7f79bf29
am: 0eabfd2d6e

Change-Id: I7f18f764215f341756ce6c495cc24481d2d10df7

7 years agoMerge changes I5d907c33,Ibce48cd2 into cw-f-dev
Matthew Bouyack [Tue, 18 Oct 2016 17:16:24 +0000 (17:16 +0000)]
Merge changes I5d907c33,Ibce48cd2 into cw-f-dev
am: a34aade39a

Change-Id: Ibbb956b813905db2942aedca379830add4f0ba53

7 years agoIn SurfaceFlinger, test fence before merging
Matthew Bouyack [Tue, 18 Oct 2016 17:16:22 +0000 (17:16 +0000)]
In SurfaceFlinger, test fence before merging
am: 377c203375

Change-Id: Icfbcbe58de9f6930f06774f47e6576ec523115bd

7 years agolibui: Change hasSignaled to return optional<bool>
Dan Stoza [Tue, 18 Oct 2016 17:16:12 +0000 (17:16 +0000)]
libui: Change hasSignaled to return optional<bool>
am: 6db42ac36e

Change-Id: I9b845b9f8c0e752733cca4ee50b2f92573e96a28

7 years agoSensors: Add WRIST_TILT_GESTURE as wake sensor
Nick Vaccaro [Tue, 18 Oct 2016 17:16:00 +0000 (17:16 +0000)]
Sensors: Add WRIST_TILT_GESTURE as wake sensor
am: 5e7f79bf29

Change-Id: Iffcd4b96d1156d314b42e89f8114b9b1de48d258

7 years agoMerge changes I5d907c33,Ibce48cd2 into cw-f-dev
Matthew Bouyack [Tue, 18 Oct 2016 17:10:30 +0000 (17:10 +0000)]
Merge changes I5d907c33,Ibce48cd2 into cw-f-dev

* changes:
  In SurfaceFlinger, test fence before merging
  libui: Change hasSignaled to return optional<bool>

7 years agoFinish implementation of "cmd".
Dianne Hackborn [Tue, 18 Oct 2016 00:40:47 +0000 (17:40 -0700)]
Finish implementation of "cmd".

Now wait for result to come back and return it, and
do some error checking and reporting for the IPC.

Test: manual.
Change-Id: Id8deb6cb3a363d0718af9e8faf2da4879ff6d27e

7 years agoMerge "Refactor Surfaceflinger Layer::latchBuffer"
TreeHugger Robot [Tue, 18 Oct 2016 00:35:19 +0000 (00:35 +0000)]
Merge "Refactor Surfaceflinger Layer::latchBuffer"

7 years agoSensors: Add WRIST_TILT_GESTURE as wake sensor
Nick Vaccaro [Mon, 17 Oct 2016 22:40:51 +0000 (15:40 -0700)]
Sensors: Add WRIST_TILT_GESTURE as wake sensor

Include WRIST_TILT_GESTURE sensor type when determining if
a sensor is a wake sensor or not in getDefaultSensor().

Change-Id: Ib9ae3990e063848163edd34be2ec021ed518e346

7 years agoIn SurfaceFlinger, test fence before merging
Matthew Bouyack [Fri, 7 Oct 2016 22:06:15 +0000 (15:06 -0700)]
In SurfaceFlinger, test fence before merging

If the old fence for a given layer has already expired, we can replace
it with the new fence rather than merging the two.

This saves 300-400us per frame on Android Wear

Change-Id: I5d907c336c7383ae4e2e0f71e42f23749494a359

7 years agolibui: Change hasSignaled to return optional<bool>
Dan Stoza [Thu, 13 Oct 2016 16:45:00 +0000 (09:45 -0700)]
libui: Change hasSignaled to return optional<bool>

Since the android::Fence::wait() call can possibly return an error,
we need some way of indicating to the caller of hasSignaled that a
fence that has not yet signaled (because it is in an error state) will
never signal. To do this, we return an optional<bool>, where true and
false indicate both that the fence is valid and that it has or hasn't
signaled. If an error is returned from wait(), we return a default
optional value (that is neither true nor false).

Test: m

Change-Id: Ibce48cd2e71ddb8ccf6cabe3284afe0efca8c132

7 years agoFix surfaceflinger file descriptor leak
Fabien Sanglard [Sat, 15 Oct 2016 01:13:33 +0000 (18:13 -0700)]
Fix surfaceflinger file descriptor leak

If a producer queues a buffer after a screen resize, the buffer
will not be removed from the buffer queue, resulting in a leak of
file descriptor.

Test: Fix was tested by the bug reporter (ARM).
Bug: 32012717

Change-Id: I3b7b0745d5fbdee97fc8df2db399c1a2fcdeb375

7 years agoMerge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev...
Ashutosh Joshi [Mon, 17 Oct 2016 17:38:15 +0000 (17:38 +0000)]
Merge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev am: 0590c6d766
am: ce1a81070c

Change-Id: Ic8b0fc90e26f546971f94ca7d6e256f2ec37f23d

7 years agoAdd a feature to signal fitness quality heart rate monitors am: 8aacbc3127
Ashutosh Joshi [Mon, 17 Oct 2016 17:38:03 +0000 (17:38 +0000)]
Add a feature to signal fitness quality heart rate monitors am: 8aacbc3127
am: 6aa7b9c77c

Change-Id: I7054716f990fd891cc864a64737295d5d1bd0824

7 years agoMerge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev
Ashutosh Joshi [Mon, 17 Oct 2016 17:31:03 +0000 (17:31 +0000)]
Merge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev
am: 0590c6d766

Change-Id: Ib3a0588a70f52ed7b8fb295d326086598d47bdc6

7 years agoAdd a feature to signal fitness quality heart rate monitors
Ashutosh Joshi [Mon, 17 Oct 2016 17:31:02 +0000 (17:31 +0000)]
Add a feature to signal fitness quality heart rate monitors
am: 8aacbc3127

Change-Id: Ic40f7583a9326393a4e6114a9e4a1c0909b15587

7 years agoMerge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev
Ashutosh Joshi [Mon, 17 Oct 2016 17:20:35 +0000 (17:20 +0000)]
Merge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev

7 years agoMerge "libui: Change hasSignaled to return optional<bool>"
Dan Stoza [Mon, 17 Oct 2016 17:08:54 +0000 (17:08 +0000)]
Merge "libui: Change hasSignaled to return optional<bool>"

7 years agoMerge "Remove ASAN specialization" am: 0723ad3969 am: 01d6334398
Dan Willemsen [Sat, 15 Oct 2016 02:31:38 +0000 (02:31 +0000)]
Merge "Remove ASAN specialization" am: 0723ad3969 am: 01d6334398
am: fa26d7e64e

Change-Id: I1de7f1d83e70605fa261dccc5a429bd5456d7e4b

7 years agoMerge "Remove ASAN specialization" am: 0723ad3969
Dan Willemsen [Sat, 15 Oct 2016 02:27:37 +0000 (02:27 +0000)]
Merge "Remove ASAN specialization" am: 0723ad3969
am: 01d6334398

Change-Id: I17ad31f5cc0fcca510c56bbabd63c32cbc448698

7 years agoMerge "Remove ASAN specialization"
Dan Willemsen [Sat, 15 Oct 2016 02:23:06 +0000 (02:23 +0000)]
Merge "Remove ASAN specialization"
am: 0723ad3969

Change-Id: I05bca0d1e4c1709565a05f1997a883c173279a53

7 years agoMerge "Remove ASAN specialization"
Treehugger Robot [Sat, 15 Oct 2016 02:17:24 +0000 (02:17 +0000)]
Merge "Remove ASAN specialization"

7 years agoRemove ASAN specialization
Dan Willemsen [Tue, 11 Oct 2016 22:59:04 +0000 (15:59 -0700)]
Remove ASAN specialization

The linker will rewrite library paths when running with asan, there's no
reason to do this manually:

10-11 23:26:33.971  8789  8789 E linker  : linker_asan dlopen translating "/system/lib64/libEGL.so" -> "/data/lib64/libEGL.so"
10-11 23:26:34.061  8790  8790 E linker  : linker_asan dlopen translating "/system/lib/libEGL.so" -> "/data/lib/libEGL.so"

Test: Boot SANITIZE_TARGET=address aosp_flounder-eng
Change-Id: I3eb9935603b267c2aefe09d4f24410cbd673feb6

7 years agoMerge "Enabling PIP for handhelds and tablets."
Winson Chung [Fri, 14 Oct 2016 22:33:51 +0000 (22:33 +0000)]
Merge "Enabling PIP for handhelds and tablets."

7 years agoAdd a feature to signal fitness quality heart rate monitors
Ashutosh Joshi [Thu, 6 Oct 2016 20:04:35 +0000 (13:04 -0700)]
Add a feature to signal fitness quality heart rate monitors

Adding a feature to signal the presence of a fitness quality heart
rate monitor on the device.

Change-Id: Iaf5f6a2dc1c76e7f4ce40612588c368bcfc0d29d

7 years agoMerge "Hardcode EGL Cache size to something more reasonable" am: 8a767feb14 am: e9322...
Dan Willemsen [Fri, 14 Oct 2016 20:42:03 +0000 (20:42 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable" am: 8a767feb14 am: e932226e8d
am: a8ce5dbacb

Change-Id: If9cda69a55f3b72734a9fd7acf2a6124f698b386

7 years agoMerge "Hardcode EGL Cache size to something more reasonable" am: 8a767feb14
Dan Willemsen [Fri, 14 Oct 2016 20:38:00 +0000 (20:38 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable" am: 8a767feb14
am: e932226e8d

Change-Id: Idd3ed3f98a486b761b188784c4478aefe9d03662

7 years agoMerge "Hardcode EGL Cache size to something more reasonable"
Dan Willemsen [Fri, 14 Oct 2016 20:34:31 +0000 (20:34 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable"
am: 8a767feb14

Change-Id: I08a68da026d9a0f36572059a7db1c5e99b988f8e

7 years agoMerge "Hardcode EGL Cache size to something more reasonable"
Treehugger Robot [Fri, 14 Oct 2016 19:26:15 +0000 (19:26 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable"

7 years agoMinor dumpstate refactorings:
Felipe Leme [Fri, 14 Oct 2016 16:13:06 +0000 (09:13 -0700)]
Minor dumpstate refactorings:

- Make some Dumpstate functions const.
- Renamed suffix_ to name_.

BUG: 26379932

Test: DumpstateTest passes

Change-Id: I324a6d63393f51ce27b2e95ce0e23296d97c328d

7 years agoRely on the platform -std default.
Elliott Hughes [Fri, 14 Oct 2016 00:21:46 +0000 (17:21 -0700)]
Rely on the platform -std default.

Bug: http://b/32019064
Test: builds
Change-Id: I03f8e660cfff247e061c838d74761a4e61ae15e8

7 years agosurfaceflinger: add support for android.hardware.graphics
Chia-I Wu [Wed, 5 Oct 2016 04:59:58 +0000 (12:59 +0800)]
surfaceflinger: add support for android.hardware.graphics

This adds a new path to HWC2 to use
android.hardware.graphics.composer@2.1::IComposer instead of hwcomposer2.
Which path to use is determined by whether BYPASS_IHWC is set at compile
time.  When it is set, the old path, kept for HWC2On1Adapter, is used.
When it is not set, the new path is taken.

BYPASS_IHWC2 is set when TARGET_USES_HWC2 is not.

Test: Maps, Camera, YouTube, etc.
Change-Id: I37aceafd1733fa9f76e7f7db4f59ad4776415306

7 years agoHardcode EGL Cache size to something more reasonable
Dan Willemsen [Tue, 11 Oct 2016 22:42:59 +0000 (15:42 -0700)]
Hardcode EGL Cache size to something more reasonable

Most of our devices are setting much larger values here than the
default, so instead of hoping every device sets the larger values, just
hardcode the cache size to the larger values.

This also reduces build-time configuration, so we can share the built
library between more devices.

Test: /data/nativetest*/EGL_test/EGL_test on aosp_flounder-eng
Change-Id: Id9b80cecff837cc35043ad3c3cf1d1c60595c237

7 years agoMerge "Remove EGL Hibernation" am: 5e86147abc am: eccef21647 am: b814df602f -s ours
Dan Willemsen [Thu, 13 Oct 2016 23:29:16 +0000 (23:29 +0000)]
Merge "Remove EGL Hibernation" am: 5e86147abc am: eccef21647 am: b814df602f  -s ours
am: 64342ba6f1  -s ours

Change-Id: I6fe23d3d46a2d5bf41a5190a678d9bbb93ca606c

7 years agoMerge "Remove EGL Hibernation" am: 5e86147abc am: eccef21647
Dan Willemsen [Thu, 13 Oct 2016 23:24:29 +0000 (23:24 +0000)]
Merge "Remove EGL Hibernation" am: 5e86147abc am: eccef21647
am: b814df602f  -s ours

Change-Id: Ia78ea687494c2125f68ba85a76bfa02c4c1f5c34

7 years agoMerge "Remove EGL Hibernation" am: 5e86147abc
Dan Willemsen [Thu, 13 Oct 2016 23:18:16 +0000 (23:18 +0000)]
Merge "Remove EGL Hibernation" am: 5e86147abc
am: eccef21647

Change-Id: Iffa69ccfeb0b80fab8d5e92873099413f7c2b560

7 years agoMerge "Remove EGL Hibernation"
Dan Willemsen [Thu, 13 Oct 2016 23:15:46 +0000 (23:15 +0000)]
Merge "Remove EGL Hibernation"
am: 5e86147abc

Change-Id: I7afcd579a1ba81733540b280186bb7e3644b1816

7 years agoMerge "Remove EGL Hibernation"
Treehugger Robot [Thu, 13 Oct 2016 23:08:57 +0000 (23:08 +0000)]
Merge "Remove EGL Hibernation"

7 years agoDelete RenderEngine path for OpenGL ES 1.0/1.1
Fabien Sanglard [Tue, 4 Oct 2016 21:02:11 +0000 (14:02 -0700)]
Delete RenderEngine path for OpenGL ES 1.0/1.1

Change-Id: Ibf9e80866a38d09a025ff5031590beb11f4c2b72

7 years agoMerge "sensor HAL v3"
Andreas Huber [Thu, 13 Oct 2016 19:55:53 +0000 (19:55 +0000)]
Merge "sensor HAL v3"

7 years agoRemove EGL Hibernation
Dan Willemsen [Tue, 11 Oct 2016 19:46:38 +0000 (12:46 -0700)]
Remove EGL Hibernation

Test: Booted aosp_flounder-eng
Merged-In: I0068bbd0a274bd0db237c30d958ea75b6d8aaf11
Change-Id: I0068bbd0a274bd0db237c30d958ea75b6d8aaf11

7 years agolibui: Change hasSignaled to return optional<bool>
Dan Stoza [Thu, 13 Oct 2016 16:45:00 +0000 (09:45 -0700)]
libui: Change hasSignaled to return optional<bool>

Since the android::Fence::wait() call can possibly return an error,
we need some way of indicating to the caller of hasSignaled that a
fence that has not yet signaled (because it is in an error state) will
never signal. To do this, we return an optional<bool>, where true and
false indicate both that the fence is valid and that it has or hasn't
signaled. If an error is returned from wait(), we return a default
optional value (that is neither true nor false).

Test: m

Change-Id: Ibce48cd2e71ddb8ccf6cabe3284afe0efca8c132

7 years agoMerge "Minor changes on dumpstate refactoring:"
TreeHugger Robot [Thu, 13 Oct 2016 18:23:32 +0000 (18:23 +0000)]
Merge "Minor changes on dumpstate refactoring:"