Commit graph

4862 commits

Author SHA1 Message Date
Brian Duddie
40283a933d Merge "Add bstack to sensors OWNERS file"
am: 0b2aabd6e6

Change-Id: Ic2b27927a8ec0d2c47373feff3fda92cfaefdf94
2018-11-30 20:29:00 -08:00
Treehugger Robot
0b2aabd6e6 Merge "Add bstack to sensors OWNERS file" 2018-12-01 04:12:31 +00:00
Brian Duddie
7b007c989f Add bstack to sensors OWNERS file
Test: n/a
Change-Id: I25ae89abe1dfe1552e92cccf0354a269959c0c13
2018-11-30 13:33:20 -08:00
Ari Hausman-Cohen
b893b0cedb Merge "camera: initialize smart pointer before usage"
am: 8f89886dad

Change-Id: If69640739b66bb2d195d40eb54d776c34f6e350b
2018-10-31 11:48:54 -07:00
Ari Hausman-Cohen
8f89886dad Merge "camera: initialize smart pointer before usage" 2018-10-31 18:34:16 +00:00
Bill Yi
86ec433acd [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 92111e7392  -s ours

Change-Id: I21738369d70ff2933628c3bea335c0b6da5e3d56
2018-10-24 15:47:22 -07:00
Bill Yi
92111e7392 Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Ib7c4eeace0e98f45c6dab1d6e0aea24b26ea917d
2018-10-24 14:47:07 -07:00
Bill Yi
7550773459 Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: Ie5e7ffdfe2253fe95da7fb09a8a86057f19303e2
2018-10-24 09:06:59 -07:00
Sergii Piatakov
16d9135088 camera: initialize smart pointer before usage
Test: try to scale image and get SIGSEGV crash of the `cameraserver`
      in the `CachedFrame` class.
Change-Id: I17ab13f7c9e7fc84cd38f89dce30e6e5e0535cc7
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-10-22 08:59:57 +03:00
Chih-hung Hsieh
7da8404d40 Merge "Allow implicit-fallthrough warnings locally."
am: e45fc974db

Change-Id: Ia00232b4ecaefea58016844c4a6e126ca2ecad80
2018-10-20 01:21:21 -07:00
Chih-hung Hsieh
e45fc974db Merge "Allow implicit-fallthrough warnings locally." 2018-10-20 05:18:01 +00:00
Chih-Hung Hsieh
f91bd7232d Allow implicit-fallthrough warnings locally.
It will be a global error by default.

Test: make checkbuild
Bug: 112564944
Change-Id: Ifdcaca758036cf9624f79befb65a1cbbd2f9b010
Exempt-From-Owner-Approval: do not block on new warnings
2018-10-19 15:26:45 -07:00
Ari Hausman-Cohen
3d22b204f2 Merge "camera: avoid narrowing of the ioctl request"
am: eef57caed9

Change-Id: Iffcccf38a94bc5f09c02e732e977118dc7e62ed7
2018-10-11 18:08:00 -07:00
Ari Hausman-Cohen
eef57caed9 Merge "camera: avoid narrowing of the ioctl request" 2018-10-12 00:45:21 +00:00
Sergii Piatakov
028763d929 camera: avoid narrowing of the ioctl request
The `ioctl` take request of the `unsinged long` type but current
implementation narrows it up to `int`.

Test: if add something like this into `IoctlLocked`:
      ```
      switch (request) {
        case VIDIOC_QBUF: break;
        default:;
      }
      ```
      the following error is appears: "error: case value evaluates
      to 3227014671, which cannot be narrowed to type 'int'
      [-Wc++11-narrowing]".
Change-Id: Icb1c99e082feb0c019393205a4b0b717ddc09c05
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-10-10 17:49:02 +03:00
Ari Hausman-Cohen
534edb5808 Merge changes Ib7227f18,I96926932,I46476112,I2c17b1e4,I47ee9e39, ...
am: c809601217

Change-Id: I2ae5ddde5595161b25c3a2d59941f59dcfcc0847
2018-08-13 11:46:40 -07:00
Ari Hausman-Cohen
c809601217 Merge changes Ib7227f18,I96926932,I46476112,I2c17b1e4,I47ee9e39, ...
* changes:
  camera: replace `-Wno-error` flag with `-Werror`
  camera: fix `-Wunused-function` compiler warnings
  camera: fix `-Wpessimizing-move` compiler warnings
  camera: fix `-Wmissing-field-initializers` compiler warnings
  camera: fix `-Wsign-compare` compiler warnings
  camera: fix `-Wunused-variable` compiler warnings
  camera: fix `-Wunused-private-field` compiler warnings
  camera: fix `-Wreorder` compiler warnings
  camera: fix `-Wunused-parameter` compiler warnings
  camera: fix `-Wformat` compiler warnings
  camera: fix `-Wmacro-redefined` compiler warnings
2018-08-13 18:39:23 +00:00
Sergii Piatakov
628e9d98e7 camera: replace -Wno-error flag with -Werror
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: Ib7227f189cdcd52698ef1a70b1ad03b2351cb55f
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-13 09:00:05 +03:00
Jerry Zhang
93221cf4cd Merge "Allow libhardware to be used in recovery" am: dc62b58d3d
am: ced9903818

Change-Id: If5c034ff6a575a0249c301a4421b2ed256414374
2018-08-10 17:26:54 -07:00
Jerry Zhang
ced9903818 Merge "Allow libhardware to be used in recovery"
am: dc62b58d3d

Change-Id: Ieaed397c7d2ebf9d175f4731a1272235246f9089
2018-08-10 17:08:33 -07:00
Treehugger Robot
dc62b58d3d Merge "Allow libhardware to be used in recovery" 2018-08-10 22:48:19 +00:00
Jerry Zhang
551e1f7bd9 Allow libhardware to be used in recovery
The default boot ctrl implementation depends
on libhardware.

Bug: 78793464
Test: Compiles, can load bootctrl in recovery
Change-Id: I9c8aa8b00b9b81f11736de13c85973e113056e69
2018-08-10 11:42:44 -07:00
Sergii Piatakov
de617f0677 camera: fix -Wunused-function compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: I96926932e7b11230d6c22fb081a89946f670511e
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:39:32 +03:00
Sergii Piatakov
21583568a8 camera: fix -Wpessimizing-move compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: I464761128a09d90415ee6ac1ef1244391edb0b54
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:39:32 +03:00
Sergii Piatakov
6a4d4d59bc camera: fix -Wmissing-field-initializers compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: I2c17b1e40b29ac400e0a950a9cd96d7f9404ea32
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:39:32 +03:00
Sergii Piatakov
64e7f2013b camera: fix -Wsign-compare compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: I47ee9e39c3bfee7927f4e57dfec459714c959e14
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:39:23 +03:00
Sergii Piatakov
416b6d263f camera: fix -Wunused-variable compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: I2755278b739db0bb746a78d0b66e1f644a44ff19
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:37:02 +03:00
Sergii Piatakov
752836d7a6 camera: fix -Wunused-private-field compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: I113e14a4296e098a6a04068262186aa8cb81fba7
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:37:02 +03:00
Sergii Piatakov
1bd0addfc9 camera: fix -Wreorder compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: I02cbe738fb7484e3a1d55712b0f0a55037e181e1
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:37:02 +03:00
Sergii Piatakov
4d3eb7a33f camera: fix -Wunused-parameter compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: I1bfd688902c78fe69bfbee3bacc73c25a5ef6c5c
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:37:02 +03:00
Sergii Piatakov
a01d1f8233 camera: fix -Wformat compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: Ib1d1fc2de98436dd7e9d15ab324789725bb2002e
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:36:42 +03:00
Sergii Piatakov
2ad591f9ea camera: fix -Wmacro-redefined compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to
      hardware/libhardware/modules/camera/3_4/Android.mk and build
      mmm hardware/libhardware/modules/camera/3_4
Change-Id: Ida00d842007e2a589907bc4fd1887076fd8b5b2a
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2018-08-10 14:16:05 +03:00
Xin Li
b95fa02a51 Merge "Merge Android Pie into master" am: 65d52dd3c9
am: 4937ac2dda

Change-Id: I53baa9079616d7336f4f8022aefe122b3a3f9f60
2018-08-07 17:55:53 -07:00
Xin Li
4937ac2dda Merge "Merge Android Pie into master"
am: 65d52dd3c9

Change-Id: If9c8448a3432d23833fcf2abbfad46b62d04c738
2018-08-07 14:21:02 -07:00
Xin Li
65d52dd3c9 Merge "Merge Android Pie into master" 2018-08-07 16:51:26 +00:00
Xin Li
06939479d6 Merge Android Pie into master
Bug: 112104996
Change-Id: If5c595a523f58a9ee90037ff03c0b8143104f6de
2018-08-06 16:51:06 -07:00
Ernie Hua
1a7b396a0a Merge "Wrong variable being printed in ALOGV statement." am: f8248731ab
am: 1c48df531f

Change-Id: I89fc058862892c8a374634a4456bff8d41537ec4
2018-07-11 10:06:30 -07:00
Ernie Hua
1c48df531f Merge "Wrong variable being printed in ALOGV statement."
am: f8248731ab

Change-Id: I4f7554a3277f37f662111916f0acf69c73c6a46c
2018-07-11 10:02:28 -07:00
Treehugger Robot
f8248731ab Merge "Wrong variable being printed in ALOGV statement." 2018-07-11 16:52:06 +00:00
Ernie Hua
5c7a3bd4f9 Wrong variable being printed in ALOGV statement.
Bug: b/111308664
Test: Force on the log message to ensure it is printed.
Change-Id: Id7df120ee024b1bf5530cd06ee4c386da6b75d29
2018-07-10 15:21:24 -07:00
Xin Li
e6e1500581 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: e1e9f555d0

Change-Id: I60b186392344b464016c0b5415e4a9d4a57f72de
2018-06-09 02:41:18 -07:00
Xin Li
e1e9f555d0 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I63d5ae1b953d740a11179f97f0555e4dbd38d7f9
2018-06-08 11:07:52 -07:00
android-build-team Robot
51d03179c9 Snap for 4787078 from af153e0a5d to pi-release
Change-Id: I05c3502b9a76bf50f6c2be1356b9451878e222e3
2018-05-17 07:23:00 +00:00
Dan Stoza
5ee2def1cc hwc2: Fix readback docs
am: af153e0a5d

Change-Id: Ida605bc803cc7e3d79e5f298c8b4a405435e18f2
2018-05-16 15:52:55 -07:00
Dan Stoza
af153e0a5d hwc2: Fix readback docs
Fixes a couple of problems with the return codes in the readback
documentation and adds a paragraph of clarification about when
getReadbackBufferAttributes will be called.

Bug: 67048889
Test: N/A, doc fix only
Change-Id: I3ea1a6993323f7ce12c36a377bf69e2866b18082
2018-05-15 13:09:51 -07:00
android-build-team Robot
20a91a6283 Snap for 4765094 from 5838dff356 to pi-release
Change-Id: I7f1a3317d0c203069cf82a278d55d632d865c65d
2018-05-06 07:21:41 +00:00
Marissa Wall
c5347d9440 gralloc1: security hardening
am: 5838dff356

Change-Id: Iae3d0e3dd6c31cd4548056fc8dd1341496e635d8
2018-05-03 15:58:13 -07:00
Marissa Wall
5838dff356 gralloc1: security hardening
Add support for getTransportSize, validateBufferSize and importBuffer
to gralloc1.

Bug: 66876469
Test: Manual

Change-Id: Ie3435297cff2d3272df658af262905c13f403e4b
2018-05-02 12:14:52 -07:00
android-build-team Robot
8807c589b1 Snap for 4696032 from 8aeeb241f1 to pi-release
Change-Id: I270a47fc769188e3c730a135f2b9ff4a0ed7d74e
2018-04-03 07:25:28 +00:00
Chia-I Wu
d40704c21a Merge "hwcomposer2: add render intent support" into pi-dev
am: 8aeeb241f1

Change-Id: I3b6ec05b1bc238b84879214afa10762759dca46b
2018-04-02 23:47:41 +00:00