OSDN Git Service

android-x86/frameworks-native.git
7 years agoSF: Request SF wakeup for pending transactions
Dan Stoza [Thu, 3 Nov 2016 18:58:36 +0000 (18:58 +0000)]
SF: Request SF wakeup for pending transactions
am: d9d1817e9a

Change-Id: I9d84ef9636acd4359dad908241bac0a5a560cd00

7 years agoSF: Request SF wakeup for pending transactions
Dan Stoza [Wed, 2 Nov 2016 23:27:47 +0000 (16:27 -0700)]
SF: Request SF wakeup for pending transactions

When a Layer receives a pending transaction, it sets a flag on itself
that it needs a transaction to be handled, but it doesn't notify
SurfaceFlinger to iterate through the layers and check for that flag.
In some cases, this led to transactions never being processed, which
can hang an application trying to push buffers that are part of a
synchronized transaction. This change pokes SurfaceFlinger when setting
the Layer flag so that it doesn't slip through the cracks.

Bug: 32541494
Bug: 32629397
Test: Two successful monkey runs
Change-Id: I4b906eee8004fad1938aa94a1aa0a0c7ea289102

7 years agoCheck and restorecon cache/code_cache directories. am: 397ec26675 am: 6437218b85
Jeff Sharkey [Mon, 31 Oct 2016 19:23:37 +0000 (19:23 +0000)]
Check and restorecon cache/code_cache directories. am: 397ec26675 am: 6437218b85
am: c981bfb460

Change-Id: Iad65eeae8cdd82e86d62ecc8490046765c1f6b48

7 years agoCheck and restorecon cache/code_cache directories. am: 397ec26675
Jeff Sharkey [Mon, 31 Oct 2016 19:17:36 +0000 (19:17 +0000)]
Check and restorecon cache/code_cache directories. am: 397ec26675
am: 6437218b85

Change-Id: I5fed67126cbcb03ac946507eada3fd66ada6c266

7 years agoCheck and restorecon cache/code_cache directories.
Jeff Sharkey [Mon, 31 Oct 2016 19:11:06 +0000 (19:11 +0000)]
Check and restorecon cache/code_cache directories.
am: 397ec26675

Change-Id: Ifd0ffc94a328f75148c24ff4e266461855c38965

7 years agoCheck and restorecon cache/code_cache directories.
Jeff Sharkey [Mon, 31 Oct 2016 17:22:19 +0000 (11:22 -0600)]
Check and restorecon cache/code_cache directories.

To speed up boot times, we recently relaxed SELinux restorecon logic
to only consider relabeling app storage when the top level SELinux
label changed.

However, if an app manually deletes either their cache or code_cache
directories, installd will helpfully recreate those directories at
the next boot, but they'll be stuck with incorrect SELinux labels
which an app can't fix.  (Our historically aggressive restorecons had
relabeled them, which is why we didn't observe until now.)

This change checks the labels of the cache/code_cache directories,
and runs a restorecon if needed, fixing the issue above.

Test: delete cache and verify recreated with correct label
Bug: 32504081
Change-Id: I0114ae4129223e5909b1075d56a9b1145ebc5ef4

7 years agoMerge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev
Naveen Kalla [Fri, 28 Oct 2016 22:34:19 +0000 (22:34 +0000)]
Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev
am: 2a221ffc01

Change-Id: I45a190ea17a413250c9d9ec9fab0a8e44696be2c

7 years agoresolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp
Naveen Kalla [Fri, 28 Oct 2016 22:22:47 +0000 (15:22 -0700)]
resolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp

Test: Resolved merge conflict and make sure change compiles

Change-Id: I341d3be774687f6cc62f9abb5998ebd6389d07ee

7 years agoMerge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev
TreeHugger Robot [Fri, 28 Oct 2016 21:46:11 +0000 (21:46 +0000)]
Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev

7 years agoKeep protected content in EGLImage attrs as needed.
Craig Donner [Fri, 28 Oct 2016 01:01:07 +0000 (01:01 +0000)]
Keep protected content in EGLImage attrs as needed.
am: a94d940c75

Change-Id: I3376d949d387b4d0f70698b26dfd9f66755db88f

7 years agoDO NOT MERGE. Add modem logs to the bugreport
Naveen Kalla [Thu, 20 Oct 2016 04:38:44 +0000 (21:38 -0700)]
DO NOT MERGE. Add modem logs to the bugreport

When user takes bug report, collect modem logs and add it to the
bugreport zip file.

Test: Take Bugreport and ensure that the modem logs are present
in userdebug builds. Also check that bug reports are collected
normally if there are no modem logs.

BUG=32219165

Change-Id: Ia20fc95ceee95972e17ac4193d350bbae36b3630

7 years agoMerge "TextOutput log improvement" am: 3e9e757437 am: 1ccb872a9e
Wei Wang [Thu, 27 Oct 2016 18:24:35 +0000 (18:24 +0000)]
Merge "TextOutput log improvement" am: 3e9e757437 am: 1ccb872a9e
am: 1136e487b7

Change-Id: I29c8813ea1bcac32971925f53b277682ed2f948a

7 years agoMerge "TextOutput log improvement" am: 3e9e757437
Wei Wang [Thu, 27 Oct 2016 18:19:05 +0000 (18:19 +0000)]
Merge "TextOutput log improvement" am: 3e9e757437
am: 1ccb872a9e

Change-Id: Ic9efec9193ed37c7bbfca966c07224b9e96349fb

7 years agoMerge "TextOutput log improvement"
Wei Wang [Thu, 27 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Merge "TextOutput log improvement"
am: 3e9e757437

Change-Id: I88fec0002898ec7da19d579d0aa4679b73bfcd53

7 years agoMerge "Enable multiple concurrent binderLibTest instances" am: 06d83ad741 am: 12a04a524b
Connor O'Brien [Thu, 27 Oct 2016 18:09:33 +0000 (18:09 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am: 06d83ad741 am: 12a04a524b
am: ea4dfd2f0d

Change-Id: I3485f6010a1090e4d709fb920b06b68a7d1cbb0a

7 years agoMerge "TextOutput log improvement"
Treehugger Robot [Thu, 27 Oct 2016 18:05:46 +0000 (18:05 +0000)]
Merge "TextOutput log improvement"

7 years agoMerge "Enable multiple concurrent binderLibTest instances" am: 06d83ad741
Connor O'Brien [Thu, 27 Oct 2016 18:05:03 +0000 (18:05 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am: 06d83ad741
am: 12a04a524b

Change-Id: I4f5d47d6d239d0df4b8e994645cd5bde4e45b88f

7 years agoMerge "Enable multiple concurrent binderLibTest instances"
Connor O'Brien [Thu, 27 Oct 2016 18:00:33 +0000 (18:00 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"
am: 06d83ad741

Change-Id: I4df9c55a81801972f1b4cbb56f11d24f5bbc9e1d

7 years agoMerge "Enable multiple concurrent binderLibTest instances"
Connor O'Brien [Thu, 27 Oct 2016 17:54:14 +0000 (17:54 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"

7 years agoKeep protected content in EGLImage attrs as needed.
Craig Donner [Thu, 20 Oct 2016 00:18:17 +0000 (17:18 -0700)]
Keep protected content in EGLImage attrs as needed.

When image_crop isn't supported, we also throw away the
protected_content_ext attrs in GLConsumer. Instead, keep them
around if they're used.

Bug: 32222880
Change-Id: Ic182810cbaacdfaf912c57667f5176d3e47941a9

7 years agoEnable multiple concurrent binderLibTest instances
Connor O'Brien [Thu, 27 Oct 2016 00:58:51 +0000 (17:58 -0700)]
Enable multiple concurrent binderLibTest instances

Each instance tries to register a service with the
same name, so suffix the service name with the
instance's PID to avoid collisions.

Test: Tests run and pass in 2 processes at once
Change-Id: I685b01fbfbad4e9bd3eb6ea06f46ffc157169909
Signed-off-by: Connor O'Brien <connoro@google.com>
7 years agoMerge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd3...
Ruben Brunk [Wed, 26 Oct 2016 00:31:07 +0000 (00:31 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd32 am: 323f83ef75
am: 4466e11fd4

Change-Id: I8577f7b46f6c53db78058c759fcfa0905ac73e8f

7 years agoDo not set VR mode feature as handset default. am: 5ce292f55b am: f0f8f0a99d
Ruben Brunk [Wed, 26 Oct 2016 00:30:52 +0000 (00:30 +0000)]
Do not set VR mode feature as handset default. am: 5ce292f55b am: f0f8f0a99d
am: f27cfdd82e

Change-Id: Ibe09a9e433ec8e18ce39d9369be3ce4e671a2e4d

7 years agoMerge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd32
Ruben Brunk [Wed, 26 Oct 2016 00:27:33 +0000 (00:27 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd32
am: 323f83ef75

Change-Id: I7f7ba9248fb860fb82522920d9befb443ebea88a

7 years agoDo not set VR mode feature as handset default. am: 5ce292f55b
Ruben Brunk [Wed, 26 Oct 2016 00:27:21 +0000 (00:27 +0000)]
Do not set VR mode feature as handset default. am: 5ce292f55b
am: f0f8f0a99d

Change-Id: I9c6f99532804546911f81b3e03faed63b652c00f

7 years agoMerge "Do not set VR mode feature as handset default." into nyc-mr1-dev
Ruben Brunk [Wed, 26 Oct 2016 00:23:04 +0000 (00:23 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev
am: 4e1d67bd32

Change-Id: I951313d72530540077a777406754ab97a4566d72

7 years agoDo not set VR mode feature as handset default.
Ruben Brunk [Wed, 26 Oct 2016 00:22:50 +0000 (00:22 +0000)]
Do not set VR mode feature as handset default.
am: 5ce292f55b

Change-Id: I913dc6997a275c90b0617c0a785e3991a947bc22

7 years agoMerge "Do not set VR mode feature as handset default." into nyc-mr1-dev
Ruben Brunk [Wed, 26 Oct 2016 00:15:11 +0000 (00:15 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev

7 years agoMerge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665...
Steve Pfetsch [Tue, 25 Oct 2016 22:23:16 +0000 (22:23 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665 am: b3f571bc1e
am: 72b05e9e96

Change-Id: I57bc57e60f654471d92271796b6e099b544760fd

7 years agoRevert "services: surfaceflinger: ASAN fix" am: 598f6d5429 am: d5156b70ff
Steve Pfetsch [Tue, 25 Oct 2016 22:23:03 +0000 (22:23 +0000)]
Revert "services: surfaceflinger: ASAN fix" am: 598f6d5429 am: d5156b70ff
am: 12924419de

Change-Id: I520fff2e1cc9b3a49478cbc9e783df081defc75d

7 years agoMerge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665
Steve Pfetsch [Tue, 25 Oct 2016 22:13:39 +0000 (22:13 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665
am: b3f571bc1e

Change-Id: Iddae1b7f6acf45da61a74622947153cf282e6a91

7 years agoRevert "services: surfaceflinger: ASAN fix" am: 598f6d5429
Steve Pfetsch [Tue, 25 Oct 2016 22:13:26 +0000 (22:13 +0000)]
Revert "services: surfaceflinger: ASAN fix" am: 598f6d5429
am: d5156b70ff

Change-Id: I35366694c5518390d49d803806955fc85bfc34f2

7 years agoMerge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev
Steve Pfetsch [Tue, 25 Oct 2016 22:05:01 +0000 (22:05 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev
am: 103ba31665

Change-Id: Ic40bef2b672597ad00b4b106410c4347b556998b

7 years agoRevert "services: surfaceflinger: ASAN fix"
Steve Pfetsch [Tue, 25 Oct 2016 22:05:00 +0000 (22:05 +0000)]
Revert "services: surfaceflinger: ASAN fix"
am: 598f6d5429

Change-Id: Ic7f8483308c1f553e1614c8d1624583c9c472423

7 years agoMerge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev
Steve Pfetsch [Tue, 25 Oct 2016 21:54:41 +0000 (21:54 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev

7 years agoRevert "services: surfaceflinger: ASAN fix"
Steve Pfetsch [Tue, 25 Oct 2016 21:47:58 +0000 (21:47 +0000)]
Revert "services: surfaceflinger: ASAN fix"

This reverts commit 1d3df546d5ee4dcc9e7cae6f8b8b790f741539af.

Original patch may have caused a stability issue caught in monkey testing.

Bug: 32312240
Change-Id: Ie8d291679590e624b8b90c4786b1c25c76cb2c9f

7 years agoMerge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report...
Felipe Leme [Tue, 25 Oct 2016 21:18:59 +0000 (21:18 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am: 7781eccbc3 am: dca861e167
am: f97bd91368

Change-Id: Ie01cd86bfb242b2e02ba55ecffad9c99a2ab962b

7 years agoresolve merge conflicts of a97a282 to nyc-mr2-dev-plus-aosp
Felipe Leme [Tue, 25 Oct 2016 21:13:13 +0000 (14:13 -0700)]
resolve merge conflicts of a97a282 to nyc-mr2-dev-plus-aosp

BUG: 32365477

Change-Id: I8075346262e94ca64b144a42f2e886496ffff62c

7 years agoMerge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report...
Felipe Leme [Tue, 25 Oct 2016 20:54:39 +0000 (20:54 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am: 7781eccbc3
am: dca861e167

Change-Id: I3f03bee749bde460029a6f27ad57897fe4b38115

7 years agoDO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."...
Felipe Leme [Tue, 25 Oct 2016 20:54:26 +0000 (20:54 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time." am: bb6b604623
am: dfc9df466f

Change-Id: I811887b84ada7e44745548064926f0bfd9f3ad57

7 years agoMerge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report...
Felipe Leme [Tue, 25 Oct 2016 20:49:46 +0000 (20:49 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev
am: 7781eccbc3

Change-Id: If9f104497a20203c6fd854091082672826857b52

7 years agoDO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."
Felipe Leme [Tue, 25 Oct 2016 20:49:45 +0000 (20:49 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."
am: bb6b604623

Change-Id: I08b640b8c1ffae80205be5dcf179403c335e43ba

7 years agoMerge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report...
TreeHugger Robot [Tue, 25 Oct 2016 20:44:14 +0000 (20:44 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev

7 years agoDO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."
Felipe Leme [Tue, 25 Oct 2016 18:18:24 +0000 (18:18 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."

This reverts commit f87959e00732d7d737527f1248a71adea99ae29d.

BUG: 32402587
Fixes: 32365477

Change-Id: Ic4daec37efbaef1906450bf6609d5588d5c9a835

7 years agoDo not set VR mode feature as handset default.
Ruben Brunk [Tue, 25 Oct 2016 01:28:46 +0000 (18:28 -0700)]
Do not set VR mode feature as handset default.

Bug: 31959453
Change-Id: I6fef6781e14f3c1239197798b79cc9239d34d53d

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 agoTextOutput log improvement
Wei Wang [Fri, 21 Oct 2016 06:18:17 +0000 (23:18 -0700)]
TextOutput log improvement

Add unit tests for log functions
Add support of std::endl
Add back support of char
Add back support of bool
Add back support of String16
Fix a build warning on union initialization

Test: run /data/nativetest(64)/binderTextOutputTest
Bug: 32181382
Change-Id: I4030b142beacc5dcd88a10904710fd6e19f7240c

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 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 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 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
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 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
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 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 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
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
Dan Willemsen [Tue, 18 Oct 2016 20:59:48 +0000 (20:59 +0000)]
Convert to Android.bp
am: 3106c1c4fc

Change-Id: I4e0b4bbe420201473a345ed19eaee753f45a4b80

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
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
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 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: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 "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 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
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 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
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