OSDN Git Service
Mathias Agopian [Tue, 4 Apr 2017 00:14:31 +0000 (17:14 -0700)]
fix race condition that can cause a use after free
Backported from
12a0ccd6f7201bac706d903ac3f436c4358fe203.
Bug:
33004354
Test: manual
Change-Id: I9b38ee644b02268c9b995a330db758aa2e568399
(cherry picked from commit
59485525a6047453e6ba16c03989381e2a0d56ec)
Chia-I Wu [Mon, 15 May 2017 17:32:27 +0000 (10:32 -0700)]
libgui: check for invalid slot in attachBuffer
Bug:
37478824
Test: manual
Change-Id: I369337d53539bf7f7e3d925bccdae4045da1b404
(cherry picked from commit
c79a29689c1046f1f0301c75df9b9a67cba8bf04)
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
(cherry picked from commit
90ce2a9c1d3af422c66b4061805831cb208263d8)
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
(cherry picked from commit
9809602ac32dcb7bceaa5bc34df5b7fb68aacd38)
gitbuildkicker [Sun, 5 Feb 2017 08:09:55 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Fabien Sanglard [Thu, 2 Feb 2017 20:20:25 +0000 (20:20 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2
am:
c1038b66dd
Change-Id: If10a72b8c856955a543cf695133b72161192b00b
Fabien Sanglard [Thu, 2 Feb 2017 20:20:13 +0000 (20:20 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607
am:
f91ee50667
Change-Id: Ib4fad8fa8a393bc6233b842f0550db03708a65b1
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
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
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
Fabien Sanglard [Thu, 2 Feb 2017 20:15:42 +0000 (20:15 +0000)]
Fix security vulnerability am:
45b202513b
am:
8778a131c2
Change-Id: Ic9300f2597702d6e83d80222dbc5ca7d2642f621
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
Fabien Sanglard [Thu, 2 Feb 2017 20:12:42 +0000 (20:12 +0000)]
Fix security vulnerability
am:
45b202513b
Change-Id: Ifaf692c814e2562332914854dc95c7715d37a5c0
TreeHugger Robot [Thu, 2 Feb 2017 20:08:46 +0000 (20:08 +0000)]
Merge "Fix security vulnerability" into nyc-dev
gitbuildkicker [Thu, 2 Feb 2017 08:09:15 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Fabien Sanglard [Thu, 2 Feb 2017 01:59:36 +0000 (01:59 +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
am:
30ab1434c3
Change-Id: I4e08855d038ae114c6c6230288c6158115fe2f7f
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
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
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
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
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
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
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
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
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
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
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
Fabien Sanglard [Thu, 2 Feb 2017 01:29:02 +0000 (01:29 +0000)]
Fix security vulnerability am:
2ae83f4f62
am:
11ab583834
Change-Id: I09ec85b9f83e1f4458940415cd07f6fca725c552
Fabien Sanglard [Thu, 2 Feb 2017 01:27:03 +0000 (01:27 +0000)]
Fix security vulnerability
am:
2ae83f4f62
Change-Id: Ie0590dbb8429b5b289f3095055abdc8d29b95a7f
gitbuildkicker [Sun, 22 Jan 2017 08:10:32 +0000 (00:10 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Jesse Hall [Fri, 20 Jan 2017 01:43:26 +0000 (17:43 -0800)]
libEGL: Add initialization tracing
The first call to eglGetDisplay() loads drivers and initializes
dispatch tables. This currently takes significant time (85-100 ms),
and can must be done before the first frame of an app can be shown.
This change adds systrace markers for the major parts of this process,
as a precursor to optimizing them.
Bug:
34404021
Test: manual systrace of calculator app startup on bullhead
Change-Id: Ibdd62ba4eb0d69e472c64081554c16283967ae08
Merged-In: If1ecb5a81f9d33daf72c6f3e5b403972f8529b2d
Fabien Sanglard [Thu, 19 Jan 2017 19:13:20 +0000 (11:13 -0800)]
Fix security vulnerability
Test: hammerhead
Bug:
32628763
Change-Id: I19a81b63fffee8f323a5925c7e8633fbd640b91c
Fabien Sanglard [Thu, 19 Jan 2017 00:43:18 +0000 (16:43 -0800)]
Fix security vulnerability
Change-Id: I4c9ea3a3177131fa29d2561da71ef18bec3af108
Test: angler, marlin
Bug:
32628763
gitbuildkicker [Wed, 18 Jan 2017 08:09:34 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Jesse Hall [Tue, 20 Dec 2016 23:24:28 +0000 (15:24 -0800)]
EGL: Load updated EGL/GLES drivers
Because the driver namespace is stored in libgui, and libgui depends
on libEGL, this required a hack for libEGL to access the namespace.
See the comment added in GraphicsEnv.h for details; the summary is
that the libgui->libEGL dependency should go away, and then libEGL can
depend on libgui directly.
For system drivers, the loader would happily load anything named
lib{GLES,EGL,GLESv2,GLESv1_CM}_*.so in /vendor/lib[64]/egl, for
backward-compatibility with the old and no-longer-supported egl.cfg
system. However, it preferred unsuffixed names. That's not actually a
good idea, since the DT_SONAME would clash with the system libraries.
For updated drivers, we only look for suffixes from the
ro.hardware.egl and ro.board.platform system properties, similar to
the Vulkan and HAL library search. A future change (tied to a future
release) will do the same for system drivers.
Bug:
33531483
Change-Id: If6eb7dbbc37f219c999e20a983569d4c4e73bda1
Merged-In: Ibfbb275629b0c6cf9c51314aea1361e81ff72d4b
Jesse Hall [Thu, 15 Dec 2016 00:54:06 +0000 (16:54 -0800)]
Load updated drivers using derived loader namespace
Bug:
33531483
Change-Id: I7e4d5b76d5dde42f2d1b2ad5079a5339a4d11f3d
Merged-In: Ia73e1e33b637d6ffd96ea0480ed6d85b9f68dce3
gitbuildkicker [Sun, 15 Jan 2017 08:10:08 +0000 (00:10 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Jesse Hall [Mon, 12 Dec 2016 20:56:46 +0000 (12:56 -0800)]
Add GraphicsEnv to libgui
This singleton class stores information provided by the framework and
makes it available to EGL/GLES/Vulkan loaders. It will eventually
replace vulkan::LoaderData and possibly the egl blob cache directory
storage.
Bug:
33531483
Change-Id: I40c3952374badabea738a34a51db90bf197979b8
Merged-In: If8b84fd38428f1cc9fcee8ffc25eb90cd87cedb4
gitbuildkicker [Thu, 12 Jan 2017 08:09:19 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Felipe Leme [Thu, 5 Jan 2017 23:05:46 +0000 (15:05 -0800)]
Added -t option to dumpstate.
This option takes a lightweight version of bugreport that only includes a few,
urgent sections used to report telephony bugs.
BUG:
32589463
BUG:
26849505
Test: manual
Merged-In: I9b7369323a62e30e5d740eeb22db0045262387ba
Change-Id: I9b7369323a62e30e5d740eeb22db0045262387ba
gitbuildkicker [Sun, 1 Jan 2017 08:09:03 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Ajit Kumar [Thu, 29 Dec 2016 21:56:44 +0000 (21:56 +0000)]
gralloc1: Acquire mutex early in release
am:
56ec3afb84
Change-Id: I7aaea43b24c8aa482d557057f3d715b56bdf4cec
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
gitbuildkicker [Tue, 20 Dec 2016 08:09:26 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Sun, 18 Dec 2016 08:10:03 +0000 (00:10 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Peng Xu [Wed, 30 Nov 2016 01:54:50 +0000 (17:54 -0800)]
[sensorservice] Init batterystats service when needed
This avoid race condition at parallel services start up that
may results in sensor power usage not being properly recorded.
Test: check all sensors, they still work
Bug:
33199244
Bug:
33623300
Change-Id: I48946667db54fc72d9be6c13b981b44d1bab88c2
(cherry picked from commit
0a031596e12ce0f081b9ee116f48f4f4635d516e)
Daniel Koch [Tue, 13 Dec 2016 23:45:13 +0000 (18:45 -0500)]
libvulkan: add NULL check to DestroySwapchainKHR
vkDestroySwapchainKHR is required to silently ignore NULL handles
that are provided to it to destroy.
This adds an early return if swapchain_handle is NULL.
Test: dEQP-VK.wsi.android.swapchain.destroy.null_handle (VK 1.0.2 CTS)
Change-Id: Ic230f114a680210cb0e0de931b17e4d70fb27f44
(cherry picked from commit
d78c2e8a0807ff45db4cb643cc2ef38eafd22551)
gitbuildkicker [Thu, 15 Dec 2016 08:09:58 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Tue, 13 Dec 2016 08:09:25 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Ajay Panicker [Wed, 14 Sep 2016 19:26:46 +0000 (12:26 -0700)]
Add btsnoop_hci.log to bugreport zip (1/2)
Bug:
28672558
Test: Manual
Merged-In: I2995a9fd0e8be031c022ef8f275aae35265ba452
Change-Id: I2995a9fd0e8be031c022ef8f275aae35265ba452
(cherry picked from commit
2f531771707bcdfc12543a99c168f8462b423b13)
gitbuildkicker [Sun, 11 Dec 2016 08:09:50 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Craig Donner [Fri, 9 Dec 2016 23:34:56 +0000 (15:34 -0800)]
Allow both RENDER and TEXTURE flags when creating native client buffers.
Bug:
33057441
Change-Id: I64ebf6bb5cb534d7f67a9338ebac4bf23a47d607
Andy Hung [Fri, 9 Dec 2016 23:00:21 +0000 (23:00 +0000)]
IServiceManager: Improve getService responsiveness in absence of service
am:
3b36bcf703
Change-Id: Idf103a3faaa30ce085b4af565dcf72096a7e3242
gitbuildkicker [Wed, 7 Dec 2016 08:09:12 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
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)
Fabien Sanglard [Tue, 6 Dec 2016 19:38:08 +0000 (19:38 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev am:
fefc4f4e94 am:
afee0c9de4 am:
68fcdf6a93
am:
f09debed94
Change-Id: Ic72c9fc0ddfc98cfced88a0e2958b6392bbb48a9
Fabien Sanglard [Tue, 6 Dec 2016 19:37:58 +0000 (19:37 +0000)]
Fix security vulneratibly
31960359 am:
dffa078205 am:
b8b076e553 am:
46dd3c89e5
am:
04f62d5b99
Change-Id: I64a922e22d208013967018bdf62213525db75f73
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
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
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
Fabien Sanglard [Tue, 6 Dec 2016 19:30:28 +0000 (19:30 +0000)]
Fix security vulneratibly
31960359 am:
dffa078205
am:
b8b076e553
Change-Id: Ia073be4ad2910078ac1e736ef6d2afadd849a525
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
Fabien Sanglard [Tue, 6 Dec 2016 19:26:57 +0000 (19:26 +0000)]
Fix security vulneratibly
31960359
am:
dffa078205
Change-Id: Icea9297e2e5f7467ece053ae869208758f40b954
Fabien Sanglard [Tue, 6 Dec 2016 19:22:20 +0000 (19:22 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev
gitbuildkicker [Tue, 6 Dec 2016 08:09:11 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Christopher Tate [Tue, 6 Dec 2016 00:31:19 +0000 (00:31 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab am:
953c05276e am:
e37a4dc7c4 am:
8ed5e3d7ca am:
9d5dd3f584
am:
9ef37cdcdc
Change-Id: Ie9b96397a99a57ec18a6b86e6733631abd0feb68
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
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
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
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
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
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
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
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
Christopher Tate [Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)]
resolve merge conflicts of
13c5c34 to mnc-dev
Change-Id: I7f57cde153648f48ff038400aa437b76971d4771
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
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
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
Nick Vaccaro [Mon, 28 Nov 2016 22:27:57 +0000 (22:27 +0000)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
am:
1f24f0f597 -s ours
Change-Id: Ibd13d13a5ba368b8c700f02d049ffbf92a2abac2
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
gitbuildkicker [Tue, 22 Nov 2016 08:09:13 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
TreeHugger Robot [Mon, 21 Nov 2016 22:38:23 +0000 (22:38 +0000)]
Merge "Remove modem log after they are added to bugreport" into nyc-mr2-dev
Wei Wang [Sun, 20 Nov 2016 04:49:09 +0000 (20:49 -0800)]
atrace.rc: move to post-fs trigger
Test: manually
Bug:
32025203
(cherrypicked from commit
835180a675147ef7dd2a325016efd3b45523acc7)
Change-Id: I787984fc8ab7151ecce9e62a25fa03b0ecf263cd
Naveen Kalla [Sat, 19 Nov 2016 01:32:23 +0000 (17:32 -0800)]
Remove modem log after they are added to bugreport
Delete the modem logfiles after it is added to the
bugreport zip file.
Bug:
32871032
Test: Take bugreports on the device and ensure that
the modem log file is deleted. Also ensure that
the generated bugreport zip file contains modem
logs on userdebug builds
Change-Id: Ia512c11cae95e370b77024492898b3ad697fa8b0
gitbuildkicker [Wed, 16 Nov 2016 08:09:16 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Casey Dahlin [Wed, 16 Nov 2016 00:11:20 +0000 (00:11 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am:
e81a4f1518 am:
2dbc712abe am:
7be8fd60ea
am:
5879e8e632
Change-Id: Iad5802baf7657e2f859e914500b7d2db1aec91e9
Casey Dahlin [Wed, 16 Nov 2016 00:11:07 +0000 (00:11 +0000)]
Fix integer overflow in unsafeReadTypedVector am:
65a8f07e57 am:
894ba10a5f am:
b7a1cc50d2
am:
5fef0c6d88
Change-Id: I1b75c83f3b2daaad30c42b0a3fed0add0cead5ee
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
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
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
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
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
Casey Dahlin [Tue, 15 Nov 2016 23:49:36 +0000 (23:49 +0000)]
Fix integer overflow in unsafeReadTypedVector
am:
65a8f07e57
Change-Id: If37f6f01bfd8e7107063ce6993cf4c2b671fe99b
Casey Dahlin [Tue, 15 Nov 2016 23:40:20 +0000 (23:40 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev
gitbuildkicker [Tue, 15 Nov 2016 08:09:13 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Fabien Sanglard [Tue, 15 Nov 2016 01:51:23 +0000 (01:51 +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
am:
97ce922887
Change-Id: I7b7bec42b2bb5d9b68e42681e599d1d979a298c1
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
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
Fabien Sanglard [Tue, 15 Nov 2016 01:37:23 +0000 (01:37 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b am:
a928cc7169 am:
0517da2c5a am:
b0dff427a1 am:
1852db9aa3 am:
d4f7a66cf6
am:
0646227ad2
Change-Id: If15e3089b94f73cee3cb0a284b0a514cf433331b
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