OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 21:37:40 +0000 (21:37 +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 am: 0c7f6e142d
am: 29c221a2e5

Change-Id: If5f2a500feb74d2b4f8b87d357ddc0143325a944

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 21:21:20 +0000 (21:21 +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
am: 0c7f6e142d

Change-Id: Ib662e6e52161cde788de5eef3baf48e025a00b89

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 21:18:21 +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: I574d7193656580b26b2a2923673f39541f010878

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 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 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 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 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 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 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 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 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 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 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 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 "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes....
Rob Carr [Tue, 16 May 2017 20:28:09 +0000 (20:28 +0000)]
Merge "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."" into oc-dev am: cbcefae07a
am: 92a3cc4761

Change-Id: I1e88987fdaacebec61a15f8234839e89f4b79799

7 years agoMerge "Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0...
Chris Forbes [Tue, 16 May 2017 20:27:44 +0000 (20:27 +0000)]
Merge "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 am: 4c69f0c2e0" into oc-dev-plus-aosp
am: 90fea838c8

Change-Id: Ia29c95ace545d1dae68273d06b55ee6d41a78cfb

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 20:27:13 +0000 (20: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 am: 593a1a217a am: e3bc28ad88 am: 600e610344 am: ce069c5a07 am: a078c0780c am: 1ceadac71b am: 912ff8af49 am: 161a9bcda1 am: eb576150d5
am: 8f47ce8194

Change-Id: I60a40d5322e4aa01f4e43f7ed861df5b3ed28a35

7 years agoMerge "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes....
Rob Carr [Tue, 16 May 2017 19:59:20 +0000 (19:59 +0000)]
Merge "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."" into oc-dev
am: cbcefae07a

Change-Id: Ia4f9ffcab90b6358413c566d9a4b05802f8bbfb1

7 years agoMerge "Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0...
Android Build Merger (Role) [Tue, 16 May 2017 19:55:38 +0000 (19:55 +0000)]
Merge "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 am: 4c69f0c2e0" into oc-dev-plus-aosp

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:55:20 +0000 (19:55 +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
am: 4c69f0c2e0

Change-Id: Ib725b06a8f1d28843717736a4a014941f4c6abbe

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:55:13 +0000 (19:55 +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
am: eb576150d5

Change-Id: If60dd4fa06a11aa72671573784c0d7774ae4c3ec

7 years agoMerge "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes....
Rob Carr [Tue, 16 May 2017 19:53:03 +0000 (19:53 +0000)]
Merge "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."" into oc-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:52:12 +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: I40d6bd0cd8d3e4630d21218d826ca86127299519

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 agoRevert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."
Rob Carr [Tue, 16 May 2017 19:40:52 +0000 (19:40 +0000)]
Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."

This reverts commit 1e079c2804edfae77925150280fe79418e58750b.

Bug: 38331032
Change-Id: Ib703b7b80a940550487a80d8ad62947e4becae93

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 agoMerge "add # vndk tags to vndk-only symbols of libnativewindow"
TreeHugger Robot [Tue, 16 May 2017 18:42:52 +0000 (18:42 +0000)]
Merge "add # vndk tags to vndk-only symbols of libnativewindow"

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 agoMerge changes from topic 'lshal_debug' into oc-dev am: 47c1875e35 -s ours
Yifan Hong [Tue, 16 May 2017 16:16:30 +0000 (16:16 +0000)]
Merge changes from topic 'lshal_debug' into oc-dev am: 47c1875e35  -s ours
am: c0e6fa641b

Change-Id: Id8f5b24bdf8fc141f42a2fb357767b45138591e4

7 years agoMerge "Int key for the named buffers."
Okan Arikan [Tue, 16 May 2017 16:14:18 +0000 (16:14 +0000)]
Merge "Int key for the named buffers."

7 years agoMerge changes from topic 'lshal_debug' into oc-dev
Yifan Hong [Tue, 16 May 2017 16:12:56 +0000 (16:12 +0000)]
Merge changes from topic 'lshal_debug' into oc-dev
am: 47c1875e35  -s ours

Change-Id: I66ecb116b5f601b08982ca82ab8aeda7e2c8a22e

7 years agoMerge changes from topic 'lshal_debug' into oc-dev
Yifan Hong [Tue, 16 May 2017 08:01:44 +0000 (08:01 +0000)]
Merge changes from topic 'lshal_debug' into oc-dev

* changes:
  Actually remove dead processes from lshal
  Add tests to lshal.
  Add `lshal debug` command.
  Lshal: support commands.
  lshal: remove "// static" comments

7 years agoMerge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc...
Rob Carr [Tue, 16 May 2017 01:28:26 +0000 (01:28 +0000)]
Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev am: 83c9468c80
am: 0f755fda7f

Change-Id: I0996c441cbfd4ead4ae5d0aaa5e80c9a02788c20

7 years agoInt key for the named buffers.
Okan Arikan [Mon, 15 May 2017 22:20:39 +0000 (15:20 -0700)]
Int key for the named buffers.

Also, rename them to global buffers from named buffers.

Bug: 38320428
Test: Run frameworks/native/libs/vr/libdvr/tests on device
Change-Id: I2109aea77e35f2ccd8055208058df4b7287c1d5e

7 years agoMerge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev
Rob Carr [Mon, 15 May 2017 23:38:34 +0000 (23:38 +0000)]
Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev
am: 83c9468c80

Change-Id: I99a0a661a5a1c222e0d32276cf4b778ffa9cd05f

7 years agoMerge "Handle EINTR from sendmsg/recvmsg" into oc-dev am: 1df013c3ef
Jesse Hall [Mon, 15 May 2017 23:34:53 +0000 (23:34 +0000)]
Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev am: 1df013c3ef
am: 3961b0e53a

Change-Id: I44819c2a7ebc1b40b462a17e24cd575ad92b919a

7 years agoMerge "Handle EINTR from sendmsg/recvmsg" into oc-dev
Jesse Hall [Mon, 15 May 2017 23:19:38 +0000 (23:19 +0000)]
Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev
am: 1df013c3ef

Change-Id: I0f452c592ce7f87b05626f468a5c2ddb989ff242

7 years agoMerge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev
Rob Carr [Mon, 15 May 2017 23:17:30 +0000 (23:17 +0000)]
Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev

7 years agoMerge "Clean up BufferHubQueue API and internal bookkeeping."
TreeHugger Robot [Mon, 15 May 2017 23:16:27 +0000 (23:16 +0000)]
Merge "Clean up BufferHubQueue API and internal bookkeeping."

7 years agoMerge "Handle EINTR from sendmsg/recvmsg" into oc-dev
TreeHugger Robot [Mon, 15 May 2017 23:06:36 +0000 (23:06 +0000)]
Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev

7 years agoClean up BufferHubQueue API and internal bookkeeping.
Corey Tabaka [Tue, 9 May 2017 01:55:02 +0000 (18:55 -0700)]
Clean up BufferHubQueue API and internal bookkeeping.

- Simplify buffer hangup accounting.
- Add extra checks to gracefully handle the epoll set and slots array
  being out of sync.
- Add tests for detaching buffers.
- Switch to using Status<T> for all return/error values.
- Fix minor bug in BufferHubQueueProducer from earlier Status<T>
  return value change.

Bug: 36401174
Test: buffer_hub_queue-test passes.
Change-Id: If7f86a45cc048dc77daa2ede56585d3f882dd24f

7 years agoHandle EINTR from sendmsg/recvmsg
Jesse Hall [Mon, 15 May 2017 21:14:01 +0000 (14:14 -0700)]
Handle EINTR from sendmsg/recvmsg

Bug: 38317278
Test: bit CtsHardwareTestCases:.HardwareBufferTest
Change-Id: I7994a416f274b7c7916d0866fcb827073b731ccb

7 years agoMerge "Add lshal --neat option" am: 3a6828d50b am: 702ca32b5a am: 42648b7216
Yifan Hong [Mon, 15 May 2017 20:38:53 +0000 (20:38 +0000)]
Merge "Add lshal --neat option" am: 3a6828d50b am: 702ca32b5a am: 42648b7216
am: 52b7b5edc4

Change-Id: Icc2a7f152310f59a36f1c24e1e955a112d61ec8c

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

Change-Id: If89739d3318c70d907070da796f8874b21e30bda

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 agoSurfaceFlinger: setGeometryAppliesWithResize crop latching fixes.
Robert Carr [Tue, 9 May 2017 19:16:54 +0000 (12:16 -0700)]
SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes.

The same sort of thing we had with setPosition...not sure why I didn't
realize we would need the fixes here too! In particular we need to ensure
the following scenarios work:

1. Additional calls to set(Final)Crop while in the setGeometryAppliesWithResize
   state are eventually applied.
2. Additional calls to set(Final)Crop while in the setGeometryAppliesWithResize
   state are not immediately applied.
3. When we latch the buffer completing the resize...current hasn't been swapped
   to drawing...which means our location in LayerRejector.cpp was the wrong
   place to update the crop. This raises questions about whether the
   Transparent region latching works.

Bug: 37531386
Test: Included in Transaction_test.
Change-Id: I5140d44fd5e591a4afe5bddc201db45f7bcb5674

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:56:04 +0000 (18:56 +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 am: b10cbc1928
am: a8b94077b6

Change-Id: I673666e5d09817ec794a3095d78d98ee5bf56599

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:55:36 +0000 (18:55 +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 am: 2a6ad8ce63
am: 42aeaf5d4a

Change-Id: I095b426a7e82f7ad8f6bcb9ff8443642f9a7fa7e

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:53:19 +0000 (18:53 +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
am: b10cbc1928

Change-Id: Idae3080357d2536f91e420620add6412f1de22ba

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:52:34 +0000 (18:52 +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
am: 2a6ad8ce63

Change-Id: Ia43098c96a074f5935511a4e2496c74678c9598d

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:49:36 +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: I58afb0e1211d2a8990d406c983eb084827a903b4

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 agoActually remove dead processes from lshal
Yifan Hong [Fri, 12 May 2017 23:33:57 +0000 (16:33 -0700)]
Actually remove dead processes from lshal

Test: run lshal with and without the change

Change-Id: Id8c52a5be3253f5ff9c1cb851459a16e01ca5dda
Merged-In: Id8c52a5be3253f5ff9c1cb851459a16e01ca5dda
Fixes: 35765788

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 agoAdd tests to lshal.
Yifan Hong [Wed, 10 May 2017 21:33:05 +0000 (14:33 -0700)]
Add tests to lshal.

Test: lshal_test
Bug: 37725279
Change-Id: I1914e6274974ed5eb0ce2d655f1333d2344b49f5
Merged-In: I1914e6274974ed5eb0ce2d655f1333d2344b49f5

7 years agoAdd `lshal debug` command.
Yifan Hong [Wed, 10 May 2017 02:33:08 +0000 (19:33 -0700)]
Add `lshal debug` command.

Supported command:
    lshal debug android.hardware.foo@1.0::IFoo option option

Test: adb unroot && lshal --debug ; echo $?
Test: adb unroot && lshal debug android.hardware.nfc@1.0::INfc ; echo $?
Test: adb root && lshal --debug ; echo $?
Test: adb root && lshal debug android.hardware.nfc@1.0::INfc ; echo $?

Bug: 37725279
Change-Id: Ia2f4c9c0d3fb0a7bb26e76f01d02f49dc426e7f8
Merged-In: Ia2f4c9c0d3fb0a7bb26e76f01d02f49dc426e7f8

7 years agoLshal: support commands.
Yifan Hong [Wed, 10 May 2017 01:49:45 +0000 (18:49 -0700)]
Lshal: support commands.

Support the following commands:
  lshal list
  lshal list -itrpc
  lshal help
  lshal help list
  lshal list -h
  lshal list --help

Test: run these commands
Bug: 37725279
Change-Id: I970fbc8d250d43f57e92f783229e0645d7e8df4e
Merged-In: I970fbc8d250d43f57e92f783229e0645d7e8df4e

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 agolshal: remove "// static" comments
Steven Moreland [Tue, 9 May 2017 23:43:46 +0000 (16:43 -0700)]
lshal: remove "// static" comments

Test: pass
Change-Id: I4d710c8aaad87cfcd7896800a5ab24f812775703
Merged-In: I4d710c8aaad87cfcd7896800a5ab24f812775703

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 agoMerge "Fixes vsync behavior in power mode transitions."
TreeHugger Robot [Mon, 15 May 2017 17:48:16 +0000 (17:48 +0000)]
Merge "Fixes vsync behavior in power mode transitions."

7 years agoMerge "Load updated graphics drivers into sphal-child namespace" into oc-dev am:...
Jesse Hall [Mon, 15 May 2017 14:37:14 +0000 (14:37 +0000)]
Merge "Load updated graphics drivers into sphal-child namespace" into oc-dev am: 6b32bed777
am: fa374e98d5

Change-Id: I0ec6b35ce64da0faeaf4dd4281f016bd049f7c38

7 years agoMerge "Load updated graphics drivers into sphal-child namespace" into oc-dev
Jesse Hall [Mon, 15 May 2017 14:34:14 +0000 (14:34 +0000)]
Merge "Load updated graphics drivers into sphal-child namespace" into oc-dev
am: 6b32bed777

Change-Id: I9cf1ef5304c97f2b740d66b3790734b40c3037d1

7 years agoMerge "Load updated graphics drivers into sphal-child namespace" into oc-dev
Jesse Hall [Mon, 15 May 2017 14:30:17 +0000 (14:30 +0000)]
Merge "Load updated graphics drivers into sphal-child namespace" into oc-dev

7 years agoMark libui as vendor_available
Jiyong Park [Fri, 28 Apr 2017 09:08:36 +0000 (18:08 +0900)]
Mark libui as vendor_available

libui is used by libgui and libstagefright_foundation which are both in
VNDK. So libui should also be in VNDK.

Bug: 37731063
Test: sailfish builds and boots
Test: 'BOARD_VNDK_VERSION=current m libui' successful
Change-Id: Ia8172a42325e5b5181741dda70048dc68e778b76

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 am: d52b085d44 am...
Yifan Hong [Sat, 13 May 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Actually remove dead processes from lshal" am: 28765c6184 am: d52b085d44 am: e69eaddc3e
am: 681af84df2

Change-Id: I9e066dcb2b9a165c2642ea393ad30d323f898c16

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

Change-Id: I120912d0dd12dec09d531a96111080c6f8a14b92

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

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

Change-Id: I8142135cfc9afe8af63fa00f35cb83ac3a4f1372

7 years agoMerge "Actually remove dead processes from lshal"
Treehugger Robot [Sat, 13 May 2017 01:25:34 +0000 (01:25 +0000)]
Merge "Actually remove dead processes from lshal"