android_system_media, branch cm-13.0 Unnamed repository; edit this file 'description' to name the repository. Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8 2018-07-16T19:01:21+00:00 Emilian Peev epeev@google.com 2018-05-11T08:53:13+00:00 de9bc5de2297b636c3841f981ae07e61840a55c9 * commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57': Camera: Initialize metadata padding field Test: Camera CTS Bug: 77238656 Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f (cherry picked from commit 6837fddebdc0ee6afe15517a620f754d88a3da42) 
* commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57':
  Camera: Initialize metadata padding field

Test: Camera CTS
Bug: 77238656
Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f
(cherry picked from commit 6837fddebdc0ee6afe15517a620f754d88a3da42)
Camera metadata: Check source metadata size 2018-01-10T19:35:36+00:00 Emilian Peev epeev@google.com 2017-11-06T10:41:19+00:00 4683e985ad9c01d79f65d97fb0c9c95fbd1b9028 Source size passed by client could be smaller than 'camera_metadata_t'. In this case the cast in 'allocate_copy_camera_metadata_checked()' will be incorrect and we will try to access invalid heap memory. Bug: 67782345 Test: Camera CTS Change-Id: I9582c704f414493978d09ffb603b5e8368cda5ce (cherry picked from commit 489bbd13bf0add8029444b9d9505b3d118776ea3) CVE-2017-13210 
Source size passed by client could be smaller than 'camera_metadata_t'.
In this case the cast in 'allocate_copy_camera_metadata_checked()' will
be incorrect and we will try to access invalid heap memory.

Bug: 67782345
Test: Camera CTS
Change-Id: I9582c704f414493978d09ffb603b5e8368cda5ce
(cherry picked from commit 489bbd13bf0add8029444b9d9505b3d118776ea3)
CVE-2017-13210
Merge tag 'android-6.0.1_r74' into HEAD 2016-11-09T19:59:35+00:00 Jessica Wagantall jwagantall@cyngn.com 2016-11-08T23:13:05+00:00 c37b3f880a73397521518c1e7bae0a8a5c45764e CYNGNOS-3303 Android 6.0.1 release 74 Change-Id: Ib27588e0b38a1471aedd610a69520737bf85d8d6 
CYNGNOS-3303

Android 6.0.1 release 74

Change-Id: Ib27588e0b38a1471aedd610a69520737bf85d8d6
Merge tag 'android-6.0.1_r72' into HEAD 2016-10-06T18:50:36+00:00 Jessica Wagantall jwagantall@cyngn.com 2016-10-06T18:50:36+00:00 69c4724d5c9f0335258d9219fe1bb285f887495d Android 6.0.1 Release 72 (M4B30X) # gpg: Signature made Tue 04 Oct 2016 09:47:48 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found 
Android 6.0.1 Release 72 (M4B30X)

# gpg: Signature made Tue 04 Oct 2016 09:47:48 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
Fix potential overflow in Visualizer effect 2016-09-27T22:59:30+00:00 rago rago@google.com 2016-08-23T18:09:52+00:00 6555c9710b8eac030367f6d36753e00b0bd379d1 Bug: 30229821 Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b (cherry picked from commit b61dd321d08b21a5629044eca7f96e2ecd348e5f) (cherry picked from commit 7bbd5008747431d42e2f8cfbc0ddcb8465cdb4a5) 
Bug: 30229821
Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b
(cherry picked from commit b61dd321d08b21a5629044eca7f96e2ecd348e5f)
(cherry picked from commit 7bbd5008747431d42e2f8cfbc0ddcb8465cdb4a5)
Camera metadata: Check for inconsistent data count 2016-08-26T23:22:11+00:00 Eino-Ville Talvala etalvala@google.com 2016-08-16T22:48:05+00:00 f3723a4b7f99c322b87c18a970b428f4b2de366d Resolve Merge conflic for mnc-mr2-release Also check for overflow of data/entry count on append. Bug: 30591838 Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2 (cherry picked from commit 8d0a86a45af999de64805bf471b60cc7120b8076) 
Resolve Merge conflic for mnc-mr2-release
Also check for overflow of data/entry count on append.

Bug: 30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2
(cherry picked from commit 8d0a86a45af999de64805bf471b60cc7120b8076)
Camera: Prevent data size overflow 2016-08-26T23:22:11+00:00 Chien-Yu Chen cychen@google.com 2016-08-12T22:40:16+00:00 0338e16553c42f4e74eeab4b58dd09a4be72df31 Add a function to check overflow when calculating metadata data size. Bug: 30741779 Change-Id: I6405fe608567a4f4113674050f826f305ecae030 (cherry picked from commit 882db905c04b09e3ce527d265eefbb7056543c93) 
Add a function to check overflow when calculating metadata
data size.

Bug: 30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030
(cherry picked from commit 882db905c04b09e3ce527d265eefbb7056543c93)
Camera metadata: Check for inconsistent data count 2016-08-26T03:17:21+00:00 Eino-Ville Talvala etalvala@google.com 2016-08-16T22:48:05+00:00 8d0a86a45af999de64805bf471b60cc7120b8076 Resolve Merge conflic for mnc-mr2-release Also check for overflow of data/entry count on append. Bug: 30591838 Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2 
Resolve Merge conflic for mnc-mr2-release
Also check for overflow of data/entry count on append.

Bug: 30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2
Camera: Prevent data size overflow 2016-08-25T20:14:17+00:00 Chien-Yu Chen cychen@google.com 2016-08-12T22:40:16+00:00 882db905c04b09e3ce527d265eefbb7056543c93 Add a function to check overflow when calculating metadata data size. Bug: 30741779 Change-Id: I6405fe608567a4f4113674050f826f305ecae030 
Add a function to check overflow when calculating metadata
data size.

Bug: 30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/system/media into cm-13.0 2016-03-11T02:33:12+00:00 Steve Kondik steve@cyngn.com 2016-03-11T02:33:12+00:00 92d65f3fd2fdf37b3593ba60a50cd5f551e7f238 Android 6.0.1 release 22 
Android 6.0.1 release 22