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: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 "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 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: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 agoFixes vsync behavior in power mode transitions.
Matthew Bouyack [Fri, 12 May 2017 19:49:32 +0000 (12:49 -0700)]
Fixes vsync behavior in power mode transitions.

Calling EventThread::onScreenAcquired enables hardware vsync and
calling EventThread::onScreenReleased disables hardware vsync.

The power modes 'NORMAL' and 'DOZE' should have hardware vsync
enabled while power modes 'OFF' and 'DOZE_SUSPEND' should have
hardware vsync disabled.

This change correctly handles the transitions from 'OFF' to
'DOZE_SUSPEND' and from either 'OFF' or 'DOZE_SUSPEND' to
'NORMAL'. Previously these cases were handled incorrectly.

Note that redundant calls to onScreenAcquired or onScreenReleased
are safe.

Fixes bug: 38232221

Change-Id: I7b00f97a67b157366364b3d26fe94533da07c263

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 agoDO NOT MERGE: SF: disable HW vsync while dozing
Zheng Zhang [Fri, 17 Mar 2017 10:19:39 +0000 (11:19 +0100)]
DO NOT MERGE: SF: disable HW vsync while dozing

It cancels any in-progress resync when display goes to sleep, then
it avoids any unexpected wake up due to delayed frames once device
has just switched to ambient mode.

In DOZE_SUSPEND, screen displays a still image in a self-refresh mode,
so there is no need to keep aligned with HW vsync. At the opposite, DOZE
mode is used to refresh the screen in Ambient (i.e. watchface refresh,
nofications, app updates in ambi-active), hence resync SF to HW vsync.

Bug: 35998607
Bug: 36215242
Change-Id: I22cd8f84e9aca04b4f657fe07785751cf31a7c68

7 years agoMerge "Fix security vulnerability" into nyc-dev am: 2188ad799e am: 80672db6b8
Fabien Sanglard [Thu, 2 Feb 2017 20:18:25 +0000 (20:18 +0000)]
Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e am: 80672db6b8
am: 900cd6a1d2

Change-Id: Ieee74bcd82513fc4612c874b966ba9903e26565c

7 years agoFix security vulnerability am: 45b202513b am: 8778a131c2
Fabien Sanglard [Thu, 2 Feb 2017 20:18:12 +0000 (20:18 +0000)]
Fix security vulnerability am: 45b202513b am: 8778a131c2
am: 18a5e5f607

Change-Id: Iec4b5c921b77fd29aea45bdb49cd4d7cda67edc6

7 years agoMerge "Fix security vulnerability" into nyc-dev am: 2188ad799e
Fabien Sanglard [Thu, 2 Feb 2017 20:15:54 +0000 (20:15 +0000)]
Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e
am: 80672db6b8

Change-Id: I5008bd9cd2b14dd52d261f5934024f7526e96f7f

7 years agoFix security vulnerability am: 45b202513b
Fabien Sanglard [Thu, 2 Feb 2017 20:15:42 +0000 (20:15 +0000)]
Fix security vulnerability am: 45b202513b
am: 8778a131c2

Change-Id: Ic9300f2597702d6e83d80222dbc5ca7d2642f621

7 years agoMerge "Fix security vulnerability" into nyc-dev
Fabien Sanglard [Thu, 2 Feb 2017 20:12:43 +0000 (20:12 +0000)]
Merge "Fix security vulnerability" into nyc-dev
am: 2188ad799e

Change-Id: Iac558b8fedbbfdd76ebe90867b70d57c33f8b644

7 years agoFix security vulnerability
Fabien Sanglard [Thu, 2 Feb 2017 20:12:42 +0000 (20:12 +0000)]
Fix security vulnerability
am: 45b202513b

Change-Id: Ifaf692c814e2562332914854dc95c7715d37a5c0

7 years agoMerge "Fix security vulnerability" into nyc-dev
TreeHugger Robot [Thu, 2 Feb 2017 20:08:46 +0000 (20:08 +0000)]
Merge "Fix security vulnerability" into nyc-dev

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:57:08 +0000 (01:57 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24 am: c7892d9d0b am: cca3b79c32 am: ebbf8a6b5a am: 5ba227f96e am: 40cd915a54 am: ded5521871 am: 0e0a258771
am: 6a5a220b48

Change-Id: I47743cb142bdb4f21202dc51482fc52996f6b7a4

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:54:35 +0000 (01:54 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24 am: c7892d9d0b am: cca3b79c32 am: ebbf8a6b5a am: 5ba227f96e am: 40cd915a54 am: ded5521871
am: 0e0a258771

Change-Id: I4479a276592fc9d5d25378a5abee12473a2104ae

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:52:06 +0000 (01:52 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24 am: c7892d9d0b am: cca3b79c32 am: ebbf8a6b5a am: 5ba227f96e am: 40cd915a54
am: ded5521871

Change-Id: Ibf93b2a73caab87ee6c0b27234a8cdc05c0aa61e

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:49:06 +0000 (01:49 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24 am: c7892d9d0b am: cca3b79c32 am: ebbf8a6b5a am: 5ba227f96e
am: 40cd915a54

Change-Id: Ib34c9d0e90e77565ab6d0d7fb805bb425964b5aa

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:46:34 +0000 (01:46 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24 am: c7892d9d0b am: cca3b79c32 am: ebbf8a6b5a
am: 5ba227f96e

Change-Id: I9fc225ba640b4391d60380d7c588015c3e5516a7

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:43:34 +0000 (01:43 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24 am: c7892d9d0b am: cca3b79c32
am: ebbf8a6b5a

Change-Id: Id8c91e714058b999805aa6da613a4343fecc1d6a

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:41:34 +0000 (01:41 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24 am: c7892d9d0b
am: cca3b79c32

Change-Id: I2e5da5ee33eb2757f360881e6ecc7dfd9fb67938

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:38:33 +0000 (01:38 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24
am: c7892d9d0b

Change-Id: Ic59ba49542b907591f3e514ae0417ed82a5be7aa

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef
Fabien Sanglard [Thu, 2 Feb 2017 01:36:33 +0000 (01:36 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef
am: 3995674f24

Change-Id: I979af2b40c8ee1b3820204cee5fa7e21e4906bf9

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f
Fabien Sanglard [Thu, 2 Feb 2017 01:34:03 +0000 (01:34 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f
am: 132d0f2aef

Change-Id: If2aa999ec1f261ea34a6aa725241ea50226083ad

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834
Fabien Sanglard [Thu, 2 Feb 2017 01:31:32 +0000 (01:31 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834
am: ac2b87ac0f

Change-Id: I3b249a9ec1820917dc015c72bd093535927c9ed6

7 years agoFix security vulnerability am: 2ae83f4f62
Fabien Sanglard [Thu, 2 Feb 2017 01:29:02 +0000 (01:29 +0000)]
Fix security vulnerability am: 2ae83f4f62
am: 11ab583834

Change-Id: I09ec85b9f83e1f4458940415cd07f6fca725c552

7 years agoFix security vulnerability
Fabien Sanglard [Thu, 2 Feb 2017 01:27:03 +0000 (01:27 +0000)]
Fix security vulnerability
am: 2ae83f4f62

Change-Id: Ie0590dbb8429b5b289f3095055abdc8d29b95a7f

7 years agoFix security vulnerability
Fabien Sanglard [Thu, 19 Jan 2017 19:13:20 +0000 (11:13 -0800)]
Fix security vulnerability

Test: hammerhead
Bug: 32628763
Change-Id: I19a81b63fffee8f323a5925c7e8633fbd640b91c

7 years agoFix security vulnerability
Fabien Sanglard [Thu, 19 Jan 2017 00:43:18 +0000 (16:43 -0800)]
Fix security vulnerability

Change-Id: I4c9ea3a3177131fa29d2561da71ef18bec3af108
Test: angler, marlin
Bug: 32628763

7 years agogralloc1: Acquire mutex early in release
Ajit Kumar [Fri, 25 Nov 2016 06:38:53 +0000 (12:08 +0530)]
gralloc1: Acquire mutex early in release

Due race condition between release and retain calls, retain return stale handle.
Which results in crash in SurfaceFlinger.
Fix crash by acquiring mutex early in release function.

Bug: 32384569
Change-Id: I9130f5864a53ef208dc1ad8ecf698f1847548285

7 years agoIServiceManager: Improve getService responsiveness in absence of service
Andy Hung [Tue, 6 Dec 2016 17:40:01 +0000 (09:40 -0800)]
IServiceManager: Improve getService responsiveness in absence of service

Now blocks for 4 seconds worst case instead of 5 seconds.
Some android devices may not have all the normal android phone services.

Test: Wear device on feldspar-dev
Bug: 33086228
Change-Id: Id83fc8cd6b657b53ef78823a460d5fba4a522ab4
(cherry picked from commit 6456e4488d59c0568a1f29dc93b7beb472236086)

7 years agoMerge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94 am: afee0c9de4
Fabien Sanglard [Tue, 6 Dec 2016 19:34:10 +0000 (19:34 +0000)]
Merge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94 am: afee0c9de4
am: 68fcdf6a93

Change-Id: I438cd8b4b922d9a76fda92d1e24a4a02c2e0f0c5

7 years agoFix security vulneratibly 31960359 am: dffa078205 am: b8b076e553
Fabien Sanglard [Tue, 6 Dec 2016 19:33:58 +0000 (19:33 +0000)]
Fix security vulneratibly 31960359 am: dffa078205 am: b8b076e553
am: 46dd3c89e5

Change-Id: I7664021716dc9f1a1e09afdbeb04a02f84195354

7 years agoMerge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94
Fabien Sanglard [Tue, 6 Dec 2016 19:30:39 +0000 (19:30 +0000)]
Merge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94
am: afee0c9de4

Change-Id: I8378cc46c5d1caaa3b018c45929b6767cefa3bb9

7 years agoFix security vulneratibly 31960359 am: dffa078205
Fabien Sanglard [Tue, 6 Dec 2016 19:30:28 +0000 (19:30 +0000)]
Fix security vulneratibly 31960359 am: dffa078205
am: b8b076e553

Change-Id: Ia073be4ad2910078ac1e736ef6d2afadd849a525

7 years agoMerge "Fix security vulneratibly 31960359" into nyc-dev
Fabien Sanglard [Tue, 6 Dec 2016 19:26:58 +0000 (19:26 +0000)]
Merge "Fix security vulneratibly 31960359" into nyc-dev
am: fefc4f4e94

Change-Id: I06631f20e9a9070ff3a71c03f9d4bab324a8b27b

7 years agoFix security vulneratibly 31960359
Fabien Sanglard [Tue, 6 Dec 2016 19:26:57 +0000 (19:26 +0000)]
Fix security vulneratibly 31960359
am: dffa078205

Change-Id: Icea9297e2e5f7467ece053ae869208758f40b954

7 years agoMerge "Fix security vulneratibly 31960359" into nyc-dev
Fabien Sanglard [Tue, 6 Dec 2016 19:22:20 +0000 (19:22 +0000)]
Merge "Fix security vulneratibly 31960359" into nyc-dev

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
Christopher Tate [Tue, 6 Dec 2016 00:28:19 +0000 (00:28 +0000)]
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e4440eab am: 953c05276e am: e37a4dc7c4 am: 8ed5e3d7ca
am: 9d5dd3f584

Change-Id: Ic7effb22aa05c626d007aef30ab572363197cad3

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
Christopher Tate [Tue, 6 Dec 2016 00:24:19 +0000 (00:24 +0000)]
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e4440eab am: 953c05276e am: e37a4dc7c4
am: 8ed5e3d7ca

Change-Id: I634d3910a329dd10a90086c5c116ae716b2187af

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
Christopher Tate [Tue, 6 Dec 2016 00:22:18 +0000 (00:22 +0000)]
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e4440eab am: 953c05276e
am: e37a4dc7c4

Change-Id: Ie0e23d8fc47bf2cb87181ddf1a03dd439fc0f3f4

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
Christopher Tate [Tue, 6 Dec 2016 00:17:19 +0000 (00:17 +0000)]
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e4440eab
am: 953c05276e

Change-Id: If6e16f080e701171d7c9b69adbeaab3a6910b63a

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950
Christopher Tate [Tue, 6 Dec 2016 00:13:48 +0000 (00:13 +0000)]
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950
am: 02e4440eab

Change-Id: I66e7e982176555f09bf298325754d708ef0ecac0

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d
Christopher Tate [Tue, 6 Dec 2016 00:09:47 +0000 (00:09 +0000)]
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d
am: abe293b950

Change-Id: I7f8ce6dbb313d592b97b41a982e629680eba36c4

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev
Christopher Tate [Tue, 6 Dec 2016 00:06:18 +0000 (00:06 +0000)]
resolve merge conflicts of 13c5c34 to mnc-dev
am: 79b74d787d

Change-Id: I383dde0596fe37282db3bb62f7ad65e763fdd1dc

7 years agoFix security vulneratibly 31960359
Fabien Sanglard [Mon, 5 Dec 2016 23:06:29 +0000 (15:06 -0800)]
Fix security vulneratibly 31960359

BufferQueueCore features a variable mLastQueuedSlot which is not
initialized in its constructor resulting in security vulnerability

Bug: 31960359
Change-Id: If892f59f6288d8b81b1e312995832a20c8341494
Tests: Manually on Angler

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev
Christopher Tate [Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)]
resolve merge conflicts of 13c5c34 to mnc-dev

Change-Id: I7f57cde153648f48ff038400aa437b76971d4771

7 years agoCorrect overflow check in Parcel resize code am: 8b64307e95
Christopher Tate [Mon, 5 Dec 2016 21:23:36 +0000 (21:23 +0000)]
Correct overflow check in Parcel resize code am: 8b64307e95
am: ed6937ae2c

Change-Id: I9ea154fd1f2ca3a69f756066fb49efc99e889224

7 years agoCorrect overflow check in Parcel resize code
Christopher Tate [Mon, 5 Dec 2016 21:20:07 +0000 (21:20 +0000)]
Correct overflow check in Parcel resize code
am: 8b64307e95

Change-Id: I371fb7c6aaf34d44d69c740eea95fe3ba125164a

7 years agoCorrect overflow check in Parcel resize code
Christopher Tate [Thu, 3 Nov 2016 20:32:41 +0000 (13:32 -0700)]
Correct overflow check in Parcel resize code

Bug 31929765

Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467

7 years ago[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Wed, 23 Nov 2016 16:44:15 +0000 (08:44 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission

Bug: 33094188
Change-Id: I1d91e855163954666a18b2f8daadb2639b946b24

7 years agoMerge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am: e81a4f1518...
Casey Dahlin [Wed, 16 Nov 2016 00:03:50 +0000 (00:03 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am: e81a4f1518 am: 2dbc712abe
am: 7be8fd60ea

Change-Id: Ic4a1d4bff81e892786296d3670559487f8d14070

7 years agoFix integer overflow in unsafeReadTypedVector am: 65a8f07e57 am: 894ba10a5f
Casey Dahlin [Wed, 16 Nov 2016 00:03:37 +0000 (00:03 +0000)]
Fix integer overflow in unsafeReadTypedVector am: 65a8f07e57 am: 894ba10a5f
am: b7a1cc50d2

Change-Id: Id199d45df5b34f3415bf1754cb324bce6a7ed983

7 years agoMerge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am: e81a4f1518
Casey Dahlin [Tue, 15 Nov 2016 23:57:19 +0000 (23:57 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am: e81a4f1518
am: 2dbc712abe

Change-Id: I14abc8f99e191328ac70176c90ba4f57e617a45e

7 years agoFix integer overflow in unsafeReadTypedVector am: 65a8f07e57
Casey Dahlin [Tue, 15 Nov 2016 23:57:07 +0000 (23:57 +0000)]
Fix integer overflow in unsafeReadTypedVector am: 65a8f07e57
am: 894ba10a5f

Change-Id: If93da0dbcbf78ea65e3ac950c5539861587526bb

7 years agoMerge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev
Casey Dahlin [Tue, 15 Nov 2016 23:49:37 +0000 (23:49 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev
am: e81a4f1518

Change-Id: I0b6ed467fc45cf8d6d233730a5a3d4b6dd3eafa7

7 years agoFix integer overflow in unsafeReadTypedVector
Casey Dahlin [Tue, 15 Nov 2016 23:49:36 +0000 (23:49 +0000)]
Fix integer overflow in unsafeReadTypedVector
am: 65a8f07e57

Change-Id: If37f6f01bfd8e7107063ce6993cf4c2b671fe99b

7 years agoMerge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev
Casey Dahlin [Tue, 15 Nov 2016 23:40:20 +0000 (23:40 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409...
Fabien Sanglard [Tue, 15 Nov 2016 01:44:23 +0000 (01:44 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a am: 57dbf1c224 am: b17adaa85f am: c261a17e51
am: ce40ad2441

Change-Id: Ia569c1b5841cf75626ae29e656688a405709ad79

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409...
Fabien Sanglard [Tue, 15 Nov 2016 01:37:51 +0000 (01:37 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a am: 57dbf1c224 am: b17adaa85f
am: c261a17e51

Change-Id: I8ef7a57b682596d4644bca2c8e5a7003d3125cca

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409...
Fabien Sanglard [Tue, 15 Nov 2016 01:31:22 +0000 (01:31 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a am: 57dbf1c224
am: b17adaa85f

Change-Id: I4259f7bbfafe66f7690c1ecd80f8c81a398ae78f

7 years agoFix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169...
Fabien Sanglard [Tue, 15 Nov 2016 01:31:22 +0000 (01:31 +0000)]
Fix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169 am: 0517da2c5a am: b0dff427a1 am: 1852db9aa3
am: d4f7a66cf6

Change-Id: I468e9387f0541fc22d71179ff6e05397f99e4dce

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409...
Fabien Sanglard [Tue, 15 Nov 2016 01:23:50 +0000 (01:23 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a
am: 57dbf1c224

Change-Id: I5f91ea6e826a24d37bf8c7f7cbcc49a235532a14

7 years agoFix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169...
Fabien Sanglard [Tue, 15 Nov 2016 01:23:50 +0000 (01:23 +0000)]
Fix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169 am: 0517da2c5a am: b0dff427a1
am: 1852db9aa3

Change-Id: Ief2e221eb25138131d4b9fe19b669dca26dd1726