OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "Disable in-place vdex update" am: d9917d78a0
David Sehr [Wed, 31 May 2017 22:10:23 +0000 (22:10 +0000)]
Merge "Disable in-place vdex update" am: d9917d78a0
am: 2521871a1f

Change-Id: I9c4d606bcb054ad96b28a4da76a7ddf241d8687b

7 years agoMerge "Disable in-place vdex update"
David Sehr [Wed, 31 May 2017 22:08:21 +0000 (22:08 +0000)]
Merge "Disable in-place vdex update"
am: d9917d78a0

Change-Id: Ieb4a1235dc99cac32b6fb441ee98e0cbdf4b7661

7 years agoMerge "Disable in-place vdex update"
Treehugger Robot [Wed, 31 May 2017 22:00:43 +0000 (22:00 +0000)]
Merge "Disable in-place vdex update"

7 years agoMerge "dumpstate: Track debuggerd API changes." am: ccc5db441b
Narayan Kamath [Wed, 31 May 2017 12:16:32 +0000 (12:16 +0000)]
Merge "dumpstate: Track debuggerd API changes." am: ccc5db441b
am: 62b9a75c4c

Change-Id: Id1320f3373a4bbcdcfd945ea9299bd8a805adc12

7 years agoMerge "dumpstate: Track debuggerd API changes."
Narayan Kamath [Wed, 31 May 2017 12:06:51 +0000 (12:06 +0000)]
Merge "dumpstate: Track debuggerd API changes."
am: ccc5db441b

Change-Id: I05214262704a572a4645df427a76227f8d9eeac4

7 years agoMerge "dumpstate: Track debuggerd API changes."
Narayan Kamath [Wed, 31 May 2017 11:55:47 +0000 (11:55 +0000)]
Merge "dumpstate: Track debuggerd API changes."

7 years agodumpstate: Track debuggerd API changes.
Narayan Kamath [Wed, 31 May 2017 09:33:28 +0000 (10:33 +0100)]
dumpstate: Track debuggerd API changes.

dump_backtrace_to_file_timeout now needs an additional argument
that specifies the dump type.

Bug: 36024548
Test: make; manual bug report capture
Change-Id: I6ce3c172dd571e296d9ced9c576b88ea487b2fbb

7 years agoDisable in-place vdex update
David Sehr [Fri, 26 May 2017 23:32:55 +0000 (16:32 -0700)]
Disable in-place vdex update

Vdex files can be corrupted by dexlayout or by previously dexlayout-ed
files being recompiled if they are used as both input and output.
Disable this feature.

Bug: 38113240
Test: OTA and dexopt
Change-Id: Iee2d9a6c1ba8cddda25290f68f50649d5288d588

7 years agoMerge "Add pids for processes that dlopens implementations" am: 2410cd179d
Yifan Hong [Fri, 26 May 2017 20:27:08 +0000 (20:27 +0000)]
Merge "Add pids for processes that dlopens implementations" am: 2410cd179d
am: 977066464e

Change-Id: Ib2b23816c0032bc6303380f05ee1bb4b45de7f43

7 years agoMerge "Add pids for processes that dlopens implementations"
Yifan Hong [Fri, 26 May 2017 20:25:27 +0000 (20:25 +0000)]
Merge "Add pids for processes that dlopens implementations"
am: 2410cd179d

Change-Id: Ifd75354a22ef848b28113e2d1d1ccf00baf1e976

7 years agoMerge "Add pids for processes that dlopens implementations"
Treehugger Robot [Fri, 26 May 2017 20:21:26 +0000 (20:21 +0000)]
Merge "Add pids for processes that dlopens implementations"

7 years agoAdd pids for processes that dlopens implementations
Yifan Hong [Thu, 25 May 2017 02:45:02 +0000 (19:45 -0700)]
Add pids for processes that dlopens implementations

Test: lshal -itrpc
Test: lshal
Test: lshal --init-vintf
Test: lshal_test

Bug: 37639822
Change-Id: Ia415e5f8dbcd10f24e9a5cfdd591eb829a1da89e

7 years agoMerge "Delete vdex file in delete_odex." am: 99dedeb690
Nicolas Geoffray [Fri, 26 May 2017 10:29:45 +0000 (10:29 +0000)]
Merge "Delete vdex file in delete_odex." am: 99dedeb690
am: f6b79dd073

Change-Id: I28ec2908c795bf3e88960732d69e2945b1eac422

7 years agoMerge "Delete vdex file in delete_odex."
Nicolas Geoffray [Fri, 26 May 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Delete vdex file in delete_odex."
am: 99dedeb690

Change-Id: Idccc7fa241cdbb72b0ac5672978350a269ac8378

7 years agoMerge "Delete vdex file in delete_odex."
Nicolas Geoffray [Fri, 26 May 2017 10:21:25 +0000 (10:21 +0000)]
Merge "Delete vdex file in delete_odex."

7 years agoDelete vdex file in delete_odex.
Nicolas Geoffray [Thu, 25 May 2017 12:58:06 +0000 (13:58 +0100)]
Delete vdex file in delete_odex.

bug: 38513395
Test: unfortunately no unit test here, so after discussing
      with agampe@ just relied on build.

Change-Id: I305ddaadc813673fb55473f5e8ca357f39cf98f3

7 years agoMerge "Add thread usage output to lshal." am: 4a3e0a9767
Steven Moreland [Thu, 25 May 2017 23:08:20 +0000 (23:08 +0000)]
Merge "Add thread usage output to lshal." am: 4a3e0a9767
am: 9a130151a2

Change-Id: I8045623cc47804816df7304cabea1633a18aeada

7 years agoMerge "Add thread usage output to lshal."
Steven Moreland [Thu, 25 May 2017 22:58:30 +0000 (22:58 +0000)]
Merge "Add thread usage output to lshal."
am: 4a3e0a9767

Change-Id: Ie0a5eb6b3f1c502e9cf6c70e10354ce133985348

7 years agoMerge "Add thread usage output to lshal."
Treehugger Robot [Thu, 25 May 2017 22:42:24 +0000 (22:42 +0000)]
Merge "Add thread usage output to lshal."

7 years agoMerge "SF: Call makeCurrent after presenting each display" am: 7bb8779a79
Season Li [Thu, 25 May 2017 01:12:03 +0000 (01:12 +0000)]
Merge "SF: Call makeCurrent after presenting each display" am: 7bb8779a79
am: 5079756e8e

Change-Id: I6075c26cb0cd73de62f1607712c720e2d2a6248c

7 years agoMerge "SF: Call makeCurrent after presenting each display"
Season Li [Thu, 25 May 2017 01:06:02 +0000 (01:06 +0000)]
Merge "SF: Call makeCurrent after presenting each display"
am: 7bb8779a79

Change-Id: If22c0369b968a72dcbac8b97061f5555c18e8432

7 years agoMerge "SF: Call makeCurrent after presenting each display"
Treehugger Robot [Thu, 25 May 2017 00:59:58 +0000 (00:59 +0000)]
Merge "SF: Call makeCurrent after presenting each display"

7 years agoAdd thread usage output to lshal.
Steven Moreland [Wed, 24 May 2017 18:23:08 +0000 (11:23 -0700)]
Add thread usage output to lshal.

This output shows how many threads are in use at a give time.

Test: lshal, manual
Bug: 35099601
Change-Id: I3a22bb131b828cdd77e73e7810229d9c68a496d3

7 years agoSF: Call makeCurrent after presenting each display
Season Li [Thu, 4 Aug 2016 21:32:44 +0000 (14:32 -0700)]
SF: Call makeCurrent after presenting each display

HWC can change EGLContext in each present. Restore to
default EGLContext after commiting each display.

Test: see https://android-review.googlesource.com/#/c/372703/
Change-Id: I4abc84fb3d4b74964fabcad5a2568ff01a6c5dbb

7 years agoMerge "Fix a anr bug caused by sendFinishedSignal logical error" am: 77bee3b429
gaoshang [Wed, 24 May 2017 16:20:54 +0000 (16:20 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error" am: 77bee3b429
am: 9d5bddcded

Change-Id: I9ff24304c580bba54afe9b0f4bc4394d513c04cf

7 years agoMerge "Fix a anr bug caused by sendFinishedSignal logical error"
gaoshang [Wed, 24 May 2017 16:18:23 +0000 (16:18 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error"
am: 77bee3b429

Change-Id: If794d0ec576c91fc8554bf974d7409966b306cba

7 years agoMerge "Fix a anr bug caused by sendFinishedSignal logical error"
Treehugger Robot [Wed, 24 May 2017 16:10:16 +0000 (16:10 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error"

7 years agoFix a anr bug caused by sendFinishedSignal logical error
gaoshang [Wed, 17 May 2017 06:36:46 +0000 (14:36 +0800)]
Fix a anr bug caused by sendFinishedSignal logical error

Because of eliminate multiple benign overflow conditions see:
https://android-review.googlesource.com/#/c/172237/
Changed the do while loop resulting in a logical difference.

When the chainIndex-- to 0, the loop is not run.
It is the most important cycle, it will push head seq to mSeqChains.
If not run, will lead to a batch of seq can not corrected finish.
Eventually leading to the occurrence of anr.

Signed-off-by: gaoshang <gaoshang@xiaomi.com>
Test: Input dispatche process
Bug: 38366215
Change-Id: I87e609dfcb00ac7b8e82c6de789df094e7c25efd

7 years agoMerge "Support halt the trace when schd-dbg hit deadline" am: f232542c03
Howard Chen [Thu, 18 May 2017 03:12:27 +0000 (03:12 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline" am: f232542c03
am: 9d57a08f8e

Change-Id: I4133c2f0eb21a282385cbb05656b115e9a5b4dfa

7 years agoMerge "Support halt the trace when schd-dbg hit deadline"
Howard Chen [Thu, 18 May 2017 03:03:38 +0000 (03:03 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline"
am: f232542c03

Change-Id: I45b92a5340d8bbc6aa0898b0a1ef073223e49cf6

7 years agoMerge "Support halt the trace when schd-dbg hit deadline"
Howard Chen [Thu, 18 May 2017 02:50:48 +0000 (02:50 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline"

7 years agoMerge "Make the binder_lock category optional" am: 61e58d5a47
Howard Chen [Wed, 17 May 2017 07:40:34 +0000 (07:40 +0000)]
Merge "Make the binder_lock category optional" am: 61e58d5a47
am: c4a8373ccd

Change-Id: I1c8565bbc58b42522a12a2b43004fc765e20f605

7 years agoMerge "Make the binder_lock category optional"
Howard Chen [Wed, 17 May 2017 07:38:36 +0000 (07:38 +0000)]
Merge "Make the binder_lock category optional"
am: 61e58d5a47

Change-Id: I6fec33b45edd7665d26f4c5ad5e9c7f4f7ce7d21

7 years agoMerge "Make the binder_lock category optional"
Treehugger Robot [Wed, 17 May 2017 07:28:41 +0000 (07:28 +0000)]
Merge "Make the binder_lock category optional"

7 years agoMake the binder_lock category optional
Howard Chen [Wed, 10 May 2017 08:32:11 +0000 (16:32 +0800)]
Make the binder_lock category optional

The binder_lock event type has been deprecated after binder
driver uses fine grained locking. This patch makes "binder_lock"
an optional category for atrace to support system w/ w/o FGL.

Bug: 37559846
Test: pixel phone with "atrace --async_start binder_lock"
Merged-In: I691efd355e903a26629f896a56a664502e5807f7
Change-Id: I691efd355e903a26629f896a56a664502e5807f7

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 21:18:40 +0000 (21:18 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22 am: 1f8b90126a am: 0544fa4580 am: 788ff8c16f am: 72c1a6f762 am: 8b99decc86 am: 83f226ba1b am: 2d4959d8eb
am: 6a7200333a

Change-Id: I3340a1f5ff6d21228a98cd0f48637b09cd07d01e

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 21:18:20 +0000 (21:18 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f am: 2fe15aa6f0 am: cce83f15e5 am: 9a44ee0742 am: 787aa48f41 am: f69675e5c2 am: d65a388e1b am: b829d2abe9 am: 79a34dd24b
am: a1b1e635cc

Change-Id: Idfd63642dda3ae741056b75c9c9ddccd63feb76f

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 21:15:44 +0000 (21:15 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22 am: 1f8b90126a am: 0544fa4580 am: 788ff8c16f am: 72c1a6f762 am: 8b99decc86 am: 83f226ba1b
am: 2d4959d8eb

Change-Id: Ic8400bff6a8c8e48719abe1aadcb0661d36bba87

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 21:15:20 +0000 (21:15 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f am: 2fe15aa6f0 am: cce83f15e5 am: 9a44ee0742 am: 787aa48f41 am: f69675e5c2 am: d65a388e1b am: b829d2abe9
am: 79a34dd24b

Change-Id: I3909027db625685911575c9c98b5446b86af09c0

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 21:12:11 +0000 (21:12 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22 am: 1f8b90126a am: 0544fa4580 am: 788ff8c16f am: 72c1a6f762 am: 8b99decc86
am: 83f226ba1b

Change-Id: Ic0586397a434045a9594b78ff955f6426b977641

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 21:11:49 +0000 (21:11 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f am: 2fe15aa6f0 am: cce83f15e5 am: 9a44ee0742 am: 787aa48f41 am: f69675e5c2 am: d65a388e1b
am: b829d2abe9

Change-Id: I3e1b7c882bcfcc93e93e296887930771878b25a1

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 21:08:54 +0000 (21:08 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22 am: 1f8b90126a am: 0544fa4580 am: 788ff8c16f am: 72c1a6f762
am: 8b99decc86

Change-Id: I025b51ff0858ddfd88fdbca04724deab8afdabd8

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 21:08:18 +0000 (21:08 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f am: 2fe15aa6f0 am: cce83f15e5 am: 9a44ee0742 am: 787aa48f41 am: f69675e5c2
am: d65a388e1b

Change-Id: I73489256702d123302a204c2720f9752515020ba

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 21:05:58 +0000 (21:05 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22 am: 1f8b90126a am: 0544fa4580 am: 788ff8c16f
am: 72c1a6f762

Change-Id: Idf9fc3f7e2d09483b7e938c0c4389813dd5f2f60

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 21:05:24 +0000 (21:05 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f am: 2fe15aa6f0 am: cce83f15e5 am: 9a44ee0742 am: 787aa48f41
am: f69675e5c2

Change-Id: Icb1a0aae634951cd903fb2deef632005e01d4d7f

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 21:02:42 +0000 (21:02 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22 am: 1f8b90126a am: 0544fa4580
am: 788ff8c16f

Change-Id: I5623d15da983b9277ab968d63b537ce396ad007c

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 21:02:17 +0000 (21:02 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f am: 2fe15aa6f0 am: cce83f15e5 am: 9a44ee0742
am: 787aa48f41

Change-Id: I96e45ad313a7ea1233972ac80a1c8c85f6e64618

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 20:59:04 +0000 (20:59 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22 am: 1f8b90126a
am: 0544fa4580

Change-Id: Id6d055a523eed1f96e1373d4f3fede43551a8abe

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 20:58:46 +0000 (20:58 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f am: 2fe15aa6f0 am: cce83f15e5
am: 9a44ee0742

Change-Id: I79f6a2eb14d624b153244788267a16c752927e33

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 20:56:04 +0000 (20:56 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22
am: 1f8b90126a

Change-Id: Iaf0fd93af8567520229a0a73fda8bd5fcc8091f1

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 20:55:47 +0000 (20:55 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f am: 2fe15aa6f0
am: cce83f15e5

Change-Id: I82264d2033d6b098199321fd29c0d26017ec5359

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 20:53:35 +0000 (20:53 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53
am: 6a9b41dc22

Change-Id: I03af2ccc0f7f671baa4ec9f7b9a3b55f8b377435

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 20:53:16 +0000 (20:53 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f
am: 2fe15aa6f0

Change-Id: I36fcc82af237645b61c69d70c574843a5b2753c8

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 20:50:05 +0000 (20:50 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7
am: 91a7e47a53

Change-Id: I198ba45e3005214e9cd41379d6f833297be93caf

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 20:49:46 +0000 (20:49 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580
am: 78976cea8f

Change-Id: I30e6a29474b6cf86f97961f527301837b35c8a36

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8
Chia-I Wu [Tue, 16 May 2017 20:46:53 +0000 (20:46 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8
am: 396cc342a7

Change-Id: Ic9f8bce011edd718580971059ae96b0d65c9fdda

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010
Dan Stoza [Tue, 16 May 2017 20:45:35 +0000 (20:45 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010
am: 970bb51580

Change-Id: I767956fd15f8be9aa30feb38ad11ec84e98a50bd

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev
Chia-I Wu [Tue, 16 May 2017 20:41:35 +0000 (20:41 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev
am: af33c978c8

Change-Id: I97f957bc5375d11cd034d4b06baa8636e7999f8c

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev
Dan Stoza [Tue, 16 May 2017 20:41:16 +0000 (20:41 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev
am: 98e3c06010

Change-Id: I28774e185329082424a26cfccca4c95c7863e88f

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev
Chia-I Wu [Tue, 16 May 2017 20:33:31 +0000 (20:33 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev
TreeHugger Robot [Tue, 16 May 2017 20:30:06 +0000 (20:30 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:52:13 +0000 (19:52 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe am: d4cbd296d6 am: 593a1a217a am: e3bc28ad88 am: 600e610344 am: ce069c5a07 am: a078c0780c am: 1ceadac71b am: 912ff8af49
am: 161a9bcda1

Change-Id: I9461a64173a220e0d21a8b8d0ef537025936660b

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:49:43 +0000 (19:49 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe am: d4cbd296d6 am: 593a1a217a am: e3bc28ad88 am: 600e610344 am: ce069c5a07 am: a078c0780c am: 1ceadac71b
am: 912ff8af49

Change-Id: I67ea29c18cbc22d806c97aab19588802a4001768

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:46:11 +0000 (19:46 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe am: d4cbd296d6 am: 593a1a217a am: e3bc28ad88 am: 600e610344 am: ce069c5a07 am: a078c0780c
am: 1ceadac71b

Change-Id: I89b2e528d27938fa6bae79b3e6baa8e89d7207dd

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:42:42 +0000 (19:42 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe am: d4cbd296d6 am: 593a1a217a am: e3bc28ad88 am: 600e610344 am: ce069c5a07
am: a078c0780c

Change-Id: I060bbdef30d8710b8e5d779a0f75b61040530353

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:39:41 +0000 (19:39 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe am: d4cbd296d6 am: 593a1a217a am: e3bc28ad88 am: 600e610344
am: ce069c5a07

Change-Id: Ic185b2a7c35ea0260d5380d606f6b7b82c78b717

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:36:43 +0000 (19:36 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe am: d4cbd296d6 am: 593a1a217a am: e3bc28ad88
am: 600e610344

Change-Id: I19dec89ef157c3a61300622c4425d5f6801f139e

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:33:42 +0000 (19:33 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe am: d4cbd296d6 am: 593a1a217a
am: e3bc28ad88

Change-Id: I4ad5bf17fdca2bd0adee7a06150d595ef9b6a0fa

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:30:42 +0000 (19:30 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe am: d4cbd296d6
am: 593a1a217a

Change-Id: I6c50751f24fdc5756bd5d1357df184d2a08f3c08

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:27:40 +0000 (19:27 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe
am: d4cbd296d6

Change-Id: I3ddc8b4600015cd53d1a41b687518cdbbc7696b6

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:24:11 +0000 (19:24 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e
am: 209ad9b6fe

Change-Id: I31fe784570c5978faf7484b3f71a074523c0d33c

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:21:39 +0000 (19:21 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d
am: 81bab8081e

Change-Id: I78509c86bada44d1d9f9c40e4d64a5120e4c7ab6

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:18:41 +0000 (19:18 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c
am: 05df3a6f4d

Change-Id: I50c771aee7375315ba6c6aa4029baacfe9c199d8

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:15:38 +0000 (19:15 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340
am: 5c5ee81b0c

Change-Id: Ie7ec2067057ea2dbd4b9af0c93a00ba53879b72f

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0
Chris Forbes [Tue, 16 May 2017 19:12:38 +0000 (19:12 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0
am: 71d3ef1340

Change-Id: I75797414173ebfb38eefe02ac0a635f10c59d883

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev
Chris Forbes [Tue, 16 May 2017 19:10:08 +0000 (19:10 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev
am: 25556811f0

Change-Id: I5a267f8dccb75625fafd96e67bc0fbb9a2492ce7

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev
Chris Forbes [Tue, 16 May 2017 19:00:54 +0000 (19:00 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev

7 years agoui: Fix bad size check in Fence::unflatten
Chris Forbes [Wed, 10 May 2017 20:12:00 +0000 (13:12 -0700)]
ui: Fix bad size check in Fence::unflatten

Differs slightly from mnc+ patch: GetFlattenedSize was fixed in mnc.

Test: Boot device, run poc from bug, observe no longer crashes
Bug: 37285689
Change-Id: Id8b851733b088cce0d07493fbf76e7e24f9299ad

7 years agolibgui: check for invalid slot in attachBuffer
Chia-I Wu [Mon, 15 May 2017 17:32:27 +0000 (10:32 -0700)]
libgui: check for invalid slot in attachBuffer

Bug: 37478824
Test: manual
Change-Id: I369337d53539bf7f7e3d925bccdae4045da1b404

7 years agoMerge "Add lshal --neat option" am: 3a6828d50b
Yifan Hong [Mon, 15 May 2017 20:14:39 +0000 (20:14 +0000)]
Merge "Add lshal --neat option" am: 3a6828d50b
am: 702ca32b5a

Change-Id: Ide589b0a4487a0a50e43fcda179bba7ad5600fc4

7 years agoMerge "Add lshal --neat option"
Yifan Hong [Mon, 15 May 2017 20:12:09 +0000 (20:12 +0000)]
Merge "Add lshal --neat option"
am: 3a6828d50b

Change-Id: I15e00e281522c2ff59f885636c49d3ac41fc8eee

7 years agoMerge "Add lshal --neat option"
Treehugger Robot [Mon, 15 May 2017 20:05:51 +0000 (20:05 +0000)]
Merge "Add lshal --neat option"

7 years agolibgui: Check slot received from IGBP in Surface
Dan Stoza [Mon, 1 May 2017 23:31:53 +0000 (16:31 -0700)]
libgui: Check slot received from IGBP in Surface

Checks that the slot number received from mGraphicBufferProducer in
Surface::dequeueBuffer is on the interval [0, NUM_BUFFER_SLOTS) to
protect against a malicious BnGraphicBufferProducer.

Bug: 36991414
Change-Id: I1a76fd1bcce1c558f1c0c30f03638278288ed4fa

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:49:35 +0000 (18:49 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457 am: fa765bacf8 am: 146f77fc3c am: 4a1e3105bf am: 380e1aa3e9
am: 0cb4516f42

Change-Id: Icb6b6a7f0887ef003897cb12c044d8826f07791a

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:46:34 +0000 (18:46 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457 am: fa765bacf8 am: 146f77fc3c am: 4a1e3105bf
am: 380e1aa3e9

Change-Id: I7eed6fe471d204a4b8ff1b82b2b7739925294b6e

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:43:32 +0000 (18:43 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457 am: fa765bacf8 am: 146f77fc3c
am: 4a1e3105bf

Change-Id: I74d66fa6fa15003235ba8e07db5327d54e4fa3f7

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:40:03 +0000 (18:40 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457 am: fa765bacf8
am: 146f77fc3c

Change-Id: Id3334d9c0eefe429cf28fea41365024f313b807b

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:37:03 +0000 (18:37 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457
am: fa765bacf8

Change-Id: I9365e5aec00280a9466908a8f3a9e525757283ed

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:34:02 +0000 (18:34 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8
am: f571b41457

Change-Id: I739439543fd954b15a6da5909a47873e9a6dd029

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:31:01 +0000 (18:31 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd
am: 1102b311c8

Change-Id: I2fc05fc6415e981f3fe13770697c810309312729

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:28:01 +0000 (18:28 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51
am: f4a1a4e7fd

Change-Id: I7ecadb481757312b22c4b47a6f8040c0e7a18d72

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:25:00 +0000 (18:25 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209
am: 2c86168b51

Change-Id: I82f10a43940d6038946f25870c8394900d5219fb

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:21:59 +0000 (18:21 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17
am: cc184e4209

Change-Id: I20d492d5b3728ccf2ef68695d54b79f1a3c8371a

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:19:31 +0000 (18:19 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4
am: e7c7be2c17

Change-Id: I79e844eff3739ea737d20f381da6fa4da9852015

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:16:30 +0000 (18:16 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours
am: bec844f6d4

Change-Id: I48d94557a005c4b0b46bf339ca685e9d1d231d97

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2
Dan Stoza [Mon, 15 May 2017 18:13:30 +0000 (18:13 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2
am: 057ae95ab2  -s ours

Change-Id: I2c6441b19650f31c7bbab9ce22191ae162ba9e58

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e
Dan Stoza [Mon, 15 May 2017 18:02:29 +0000 (18:02 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e
am: 7cb9cd3df2

Change-Id: Iff706258762cac4bfb7d97af7d365412d9ee661d

7 years agolibgui: Check slot received from IGBP in Surface
Dan Stoza [Mon, 15 May 2017 17:59:58 +0000 (17:59 +0000)]
libgui: Check slot received from IGBP in Surface
am: ac93b3a30e

Change-Id: I6ab9bc7f577634c0bf23359b5eb60e6dd07e4854

7 years agoAdd lshal --neat option
Yifan Hong [Fri, 12 May 2017 23:56:43 +0000 (16:56 -0700)]
Add lshal --neat option

... that doesn't output explanatory text and title line.

Test: lshal --neat
Test: lshal
Test: lshal --neat -itrpc

Change-Id: I269a5d284903dc0e9bc3be96379ed41aecea8ddb
Fixes: 38211518

7 years agoMerge "Actually remove dead processes from lshal" am: 28765c6184
Yifan Hong [Sat, 13 May 2017 01:36:32 +0000 (01:36 +0000)]
Merge "Actually remove dead processes from lshal" am: 28765c6184
am: d52b085d44

Change-Id: Ia86f84007a37f5ae158d85bd3fc0f947e5d84c37