summaryrefslogtreecommitdiffstats
path: root/libs/gui
Commit message (Collapse)AuthorAgeFilesLines
* Fix SF security vulnerability: 32706020Fabien Sanglard2017-03-131-0/+1
| | | | | | | | | | | | Because of lack of mutex lock when get mConsumerName, if one thread getConsumerName, another thread setConsumerName frequently, an UAF will be triggered. Change-Id: Id1bbf0d15de6d16def2f54ecade385058cda3b65 Test: Marling with poc provided in bug report. Bug: 32706020 (cherry picked from commit d073eb7a3f28fd74bfa24c8b7599465cb7de5436) (cherry picked from commit 2e16d5fac149dab3c3e8f1b2ca89f45cf55a7b34)
* Fix SF security vulnerability: 32660278Fabien Sanglard2017-01-131-0/+1
| | | | | | | | | | | | Because of lack of mutex lock when get mSidebandStream, if one thread getSidebandStream, another thread setSidebandStream frequently, an UAF will be triggered. Bug: 32660278 Test: Marlin device with poc Change-Id: Idbcf0976ce2db682d0f13455105c45a5c7481a45 (cherry picked from commit 2d8a2432e04234d9edbb3b099f9bbbaa36ad4843) (cherry picked from commit 675e212c8c6653825cc3352c603caf2e40b00f9f)
* Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-032-1/+2
|\ | | | | | | | | | | | | Ticket: CYNGNOS-2373 Android 6.0.1 release 43 (MOB30J) Change-Id: I1d6a9cc67ded5dd7d0ee1f17773e326ac0ae87ce
| * BQ: fix some uninitialized variablesPablo Ceballos2016-03-252-1/+2
| | | | | | | | | | | | | | Bug 27555981 Bug 27556038 Change-Id: I436b6fec589677d7e36c0e980f6e59808415dc0e
| * Add SN loggingPablo Ceballos2016-02-261-0/+1
| | | | | | | | | | | | Bug 27046057 Change-Id: Iede7c92e59e60795df1ec7768ebafd6b090f1c27
| * BQ: Add permission check to BufferQueueConsumer::dumpPablo Ceballos2016-02-261-1/+15
| | | | | | | | | | | | Bug 27046057 Change-Id: Id7bd8cf95045b497943ea39dde49e877aa6f5c4e
* | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-1/+16
|\ \ | | | | | | | | | | | | Ticket: CYNGNOS-2213 Android 6.0.1 release 24
| * | Add SN loggingPablo Ceballos2016-03-011-0/+1
| | | | | | | | | | | | | | | | | | Bug 27046057 Change-Id: Iede7c92e59e60795df1ec7768ebafd6b090f1c27
| * | BQ: Add permission check to BufferQueueConsumer::dumpPablo Ceballos2016-03-011-1/+15
| | | | | | | | | | | | | | | | | | Bug 27046057 Change-Id: Id7bd8cf95045b497943ea39dde49e877aa6f5c4e
| * | IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: ↵Robert Shih2016-01-151-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 413318311c am: dc9ec35294 am: 9d959e2755 am: edb7c81a1b am: 2a7a1247cb * commit '2a7a1247cb4829daaaa4e6a6ee3e670cd2f068bf': IGraphicBufferProducer: fix QUEUE_BUFFER info leak
| | * \ IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: ↵Robert Shih2016-01-151-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 413318311c am: dc9ec35294 am: 9d959e2755 am: edb7c81a1b * commit 'edb7c81a1b99d2456910b03db9e4ac250eac2fab': IGraphicBufferProducer: fix QUEUE_BUFFER info leak
| | | * \ IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: ↵Robert Shih2016-01-151-0/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 413318311c am: dc9ec35294 am: 9d959e2755 * commit '9d959e275561bcace3aab1f9df009c6c880003fa': IGraphicBufferProducer: fix QUEUE_BUFFER info leak
| | | | * \ IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37 am: 413318311cRobert Shih2016-01-151-0/+1
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dc9ec35294 * commit 'dc9ec35294b8ec6b6c349b826edc9b44f4ddb96d': IGraphicBufferProducer: fix QUEUE_BUFFER info leak
| | | | | * \ IGraphicBufferProducer: fix QUEUE_BUFFER info leak am: d06421fd37Robert Shih2016-01-151-0/+1
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 413318311c * commit '413318311c8cc356dd7e0837ce26e937a9f4c56a': IGraphicBufferProducer: fix QUEUE_BUFFER info leak
| | | | | | * \ IGraphicBufferProducer: fix QUEUE_BUFFER info leakRobert Shih2016-01-151-0/+1
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d06421fd37 * commit 'd06421fd37fbb7fd07002e6738fac3a223cb1a62': IGraphicBufferProducer: fix QUEUE_BUFFER info leak
| | | | | | | * | IGraphicBufferProducer: fix QUEUE_BUFFER info leakRobert Shih2016-01-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26338109 Change-Id: I8a979469bfe1e317ebdefa43685e19f9302baea8
| * | | | | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7 am: ↵Robert Shih2016-01-151-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ee203b59d am: dc252255af am: 202aaa8f97 * commit '202aaa8f97083b68c0a736f4cd432f61c9b0989d': IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
| | * | | | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7 am: ↵Robert Shih2016-01-151-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ee203b59d am: dc252255af * commit 'dc252255af835bb3a69bc9a0d01da12419c0fc05': IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
| | | * | | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am: dded8fdbb7Robert Shih2016-01-151-1/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7ee203b59d * commit '7ee203b59d9a74d485ce2fdfd07e96b2d10ff23b': IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
| | | | * | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leakRobert Shih2016-01-151-1/+1
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dded8fdbb7 * commit 'dded8fdbb700d6cc498debc69a780915bc34d755': IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
| | | | | * | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leakRobert Shih2016-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26338113 Change-Id: I019c4df2c6adbc944122df96968ddd11a02ebe33
| | | | * | | | | am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid ↵Naveen Leekha2015-09-241-2/+2
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data leak * commit '18165848e86feab8656bfdac3173bccf45a9a6df': Initialize local variables to avoid data leak
| | | | | * | | | am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leakNaveen Leekha2015-09-241-2/+2
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2c4f4fb8b34e36a4f2760f3812c942604cabfb6': Initialize local variables to avoid data leak
| | | | | | * | | am c1e6fbb5: Initialize local variables to avoid data leakNaveen Leekha2015-09-241-2/+2
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4': Initialize local variables to avoid data leak
| | | | | | | * | Initialize local variables to avoid data leakNaveen Leekha2015-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The uninitialized local variables pick up whatever the memory content was there on stack. This data gets sent to the remote process in case of a failed transaction, which is a security issue. Fixed. (Manual merge of master change 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c ) For b/23696300 Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
* | | | | | | | | Merge tag 'android-6.0.1_r17' into HEADJessica Wagantall2016-03-072-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.1 release 17 Ticket: CYNGNOS-1854
| * | | | | | | | IGraphicBufferProducer: fix QUEUE_BUFFER info leakRobert Shih2016-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26338109 Change-Id: I8a979469bfe1e317ebdefa43685e19f9302baea8
| * | | | | | | | IGraphicBufferConsumer: fix ATTACH_BUFFER info leakRobert Shih2016-01-221-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26338113 Change-Id: I019c4df2c6adbc944122df96968ddd11a02ebe33
* | | | | | | | sensor: Skip additional permission request checksMatt Filetto2015-12-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Some legacy Samsung HALs supporting BODY_SENSOR types are incompatible with the new permission checks added in M. Extend the NO_SENSOR_PERMISSION_CHECK flags to cover more of the actual checks. Change-Id: Id2b9b57d8151b0998d9233e0a6541e8c88e06af7
* | | | | | | | sensor: Allow devices to skip the permission requestChristopher N. Hesse2015-12-182-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed by Samsung devices with pre-M sensor blobs which have support for SENSOR_TYPE_HEART_RATE or body sensors in general. These HALs somehow segfault on the flagged code. Change-Id: I698f4129e71b683f6f063f00da79f32a5f521149
* | | | | | | | Fix the execution point of onFrameAvailable/onFrameReplaced callbacksChristian Poetzsch2015-12-161-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a4650a5 the concept of a maximum frame number allowance for the consumer was introduced. A call to acquireBuffers will only return buffers when their frame number is less-than-or-equal-to this maximum frame number. When SurfaceFlinger is the consumer, this maximum frame number is calculated in the onFrameAvailable/onFrameReplaced callbacks. These callbacks are called when a new buffer is dequeued by the application. The problem is that these callbacks are called _after_ the fence wait which is used to throttle the frame production of client apps. When the previous frame needs a long time to draw, those waits can potentially be a long time. As a result SurfaceFlinger won't do any composition with the new frame until the wait is over. Normally this isn't a big problem because there is a queue of buffers for SurfaceFlinger to work with. However, this changes massively when a client app is using a swap interval of zero. In this case, a new frame will instantly replace the previous queued frame. However, SurfaceFlinger doesn't know this until the onFrameReplaced callback gets called - which is delayed by the fence wait. If the timing is bad, SurfaceFlinger never gets a chance to pick up a new frame to do the composition with. We see this behaviour on our TC development system (slow GPU) with legacy on-screen benchmarks. Such apps are using a swap interval of zero and sometimes frames don't get updated for several seconds. This behaviour can be also seen on a Nexus5, although it isn't as obvious as on our TC. The fix in this cl is to move the EGL throttling to the end of the queueBuffers function. This ensures that if a frame gets replaced in the queue, all consumers who installed the callbacks, get called in a timely fashion. Change-Id: I36e9ecda162150f41e97d4fb7437963a3d86b371 Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
* | | | | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-071-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/native into cm-13.0 Android 6.0.1 release 3 Change-Id: I437aaf148d440a8144afe1454948980fc3b40cca
| * | | | | | | Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-devAravind Akella2015-10-141-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Set DATA_INJECTION mode flag for sensors.Aravind Akella2015-09-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24001171 Change-Id: I70133546c68fb478b2c2062f05a4164a36cd9e4b
* | | | | | | | | SurfaceFlinger: Native changes to add blur effectByunghun Jeon2015-11-083-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Native changes to add blur-behind and blur mask effect Change-Id: I54faf82d750e8299de6d261f6a893ab26d08df84 SurfaceFlinger: Adding template for LayerBlur files Change-Id: I444009113b7bdd6c5284863fd1f56358e67d9fe6 SurfaceFlinger: Featurize libuiblur module for OSS build Change-Id: Ifdc176e699434125d17b111c044b8ba954cf717c
* | | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-052-5/+71
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: include/android/input.h Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
| * | | | | | | | am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-devNaveen Leekha2015-09-241-2/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '69412a51f58fa9450f1cb077c8d4b6410128d993': resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
| | * | | | | | | am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-devNaveen Leekha2015-09-241-2/+2
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'c4bd7211373cf5b745c7d4f849f43f7a2d2b1141': resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
| | | * | | | | | resolved conflicts for 7534e4e6 to lmp-mr1-ub-devNaveen Leekha2015-09-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I543df164076b44578b14d41031800bb62b81586d
| * | | | | | | | am 571e27e2: am e889592e: am 73887c08: am b414255f: Initialize local ↵Naveen Leekha2015-09-241-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables to avoid data leak * commit '571e27e20e30560985d7c3a3ba8885693695b0fc': Initialize local variables to avoid data leak
| | * | | | | | | am e889592e: am 73887c08: am b414255f: Initialize local variables to avoid ↵Naveen Leekha2015-09-241-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data leak * commit 'e889592e33891c9b88ff6ba655426118f8ef12ee': Initialize local variables to avoid data leak
| | | * | | | | | am 73887c08: am b414255f: Initialize local variables to avoid data leakNaveen Leekha2015-09-241-1/+1
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit '73887c0864c9a928db6f66bd48c5aea4d31d9a8b': Initialize local variables to avoid data leak
| | | | * | | | | am b414255f: Initialize local variables to avoid data leakNaveen Leekha2015-09-241-1/+1
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'b414255f53b560a06e642251535b019327ba0d7b': Initialize local variables to avoid data leak
| | | | | * | | | Initialize local variables to avoid data leakNaveen Leekha2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The uninitialized local variables pick up whatever the memory content was there on stack. This data gets sent to the remote process in case of a failed transaction, which is a security issue. Fixed. (Partial manual merge of master change 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest to automerge from klp-dev) For b/23696300 Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
| * | | | | | | | am e35c7d65: Add body sensors app op for custom sensorsPrashant Malani2015-09-031-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e35c7d65bb3c226fe3c5fc5e3933f64f0963eaeb': Add body sensors app op for custom sensors
| | * | | | | | | Add body sensors app op for custom sensorsPrashant Malani2015-09-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the custom sensor requires the BODY SENSOR permission, we should add the body sensors app op for the custom sensor Bug: 23396558 Change-Id: I132917d1bca12c76c8a9fb146e00951cba3e6d7a
| * | | | | | | | SensorManager fixes.Aravind Akella2015-08-251-5/+15
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i) Use pingBinder() to check the status of sensorservice everytime an event_queue is created. Retry to establish the binder connection if SensorService has recovered from a runtime restart. ii) LOG_ALWAYS_FATAL_IF getService(SensorService) returns NULL or malloc returns NULL. Bug: 22634472 Change-Id: I4e3912839b6f4114be1a124510878774dbd576a4
| * | | | | | | Bug fix in SensorManager.Aravind Akella2015-07-301-3/+59
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SensorService hasn't started when SensorManager instance is requested, keep retrying for a longer duration. Bug: 22529981 Change-Id: I3c506d962b61347085fc80b2c5832289539d6853
* | | | | | | Merge tag 'android-6.0.0_r5' into cm-13.0Ricardo Cerqueira2015-11-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 5
| * | | | | | | Initialize local variables to avoid data leakNaveen Leekha2015-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The uninitialized local variables pick up whatever the memory content was there on stack. This data gets sent to the remote process in case of a failed transaction, which is a security issue. Fixed. (Partial manual merge of master change 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest to automerge from klp-dev) For b/23696300 Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a