OSDN Git Service
Mathias Agopian [Tue, 6 Jun 2017 18:18:59 +0000 (18:18 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b am:
ee464e00d3 am:
21e9397776 -s ours am:
1b81145396
am:
390786a204
Change-Id: I606f740ad26e0b415149a657adfe6c2dd879c139
Mathias Agopian [Tue, 6 Jun 2017 18:05:04 +0000 (18:05 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b am:
ee464e00d3 am:
21e9397776 -s ours
am:
1b81145396
Change-Id: I3038e41c1e4b64e397162fea3ddb80eab6374614
Mathias Agopian [Tue, 6 Jun 2017 17:59:02 +0000 (17:59 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b am:
ee464e00d3
am:
21e9397776 -s ours
Change-Id: If0f229ba54f2c9978ba83beca331896d1d303db4
Mathias Agopian [Tue, 6 Jun 2017 17:46:30 +0000 (17:46 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0 am:
46361c6c2b
am:
ee464e00d3
Change-Id: Ifb22956eadae06f2ff6b0445d5e92e450c947942
Mathias Agopian [Tue, 6 Jun 2017 17:40:00 +0000 (17:40 +0000)]
fix race condition that can cause a use after free am:
59485525a6 am:
5da64c91d0
am:
46361c6c2b
Change-Id: I33758163baac3c96525751d313091a5bce0d5377
Mathias Agopian [Tue, 6 Jun 2017 17:33:59 +0000 (17:33 +0000)]
fix race condition that can cause a use after free am:
59485525a6
am:
5da64c91d0
Change-Id: I6358492afbd410f20a96ceccc7957a67112c58bc
Mathias Agopian [Tue, 6 Jun 2017 17:27:59 +0000 (17:27 +0000)]
fix race condition that can cause a use after free
am:
59485525a6
Change-Id: I42d7ee49dc3dcbd9d5d4a86fc9d018ff6c29534d
Chia-I Wu [Tue, 6 Jun 2017 16:23:38 +0000 (16:23 +0000)]
Merge "surfaceflinger: fix layer count" into oc-dev am:
39cf8b4944
am:
317b493667
Change-Id: Ibc092a475c8733a7a70359516e869a83573c6f5c
Chia-I Wu [Tue, 6 Jun 2017 15:42:52 +0000 (15:42 +0000)]
Merge "surfaceflinger: fix layer count" into oc-dev
am:
39cf8b4944
Change-Id: I6a7c3ebc27831792be6329ac6083c86c61f01499
Chia-I Wu [Tue, 6 Jun 2017 15:32:08 +0000 (15:32 +0000)]
Merge "surfaceflinger: fix layer count" into oc-dev
Nicolas Geoffray [Tue, 6 Jun 2017 08:44:36 +0000 (08:44 +0000)]
Merge "Revert "Disable in-place vdex update"" am:
52ca987db6 am:
deb23917a9 am:
3470e3e3f7
am:
fd256c977a
Change-Id: I59679c67151f61644662229c0106add720299dd1
Nicolas Geoffray [Tue, 6 Jun 2017 08:35:54 +0000 (08:35 +0000)]
Merge "Revert "Disable in-place vdex update"" am:
52ca987db6 am:
deb23917a9
am:
3470e3e3f7
Change-Id: I9b6b0b3fecb25e01b10d126e9d236658acd1e99c
Nicolas Geoffray [Tue, 6 Jun 2017 08:29:54 +0000 (08:29 +0000)]
Merge "Revert "Disable in-place vdex update"" am:
52ca987db6
am:
deb23917a9
Change-Id: I194665350fb6416acc1158fdfc125d6867cbf588
Nicolas Geoffray [Tue, 6 Jun 2017 08:23:23 +0000 (08:23 +0000)]
Merge "Revert "Disable in-place vdex update""
am:
52ca987db6
Change-Id: Id4060442d160fb91b8245388c1a45f442ac20a89
Nicolas Geoffray [Tue, 6 Jun 2017 08:13:27 +0000 (08:13 +0000)]
Merge "Revert "Disable in-place vdex update""
Nicolas Geoffray [Mon, 5 Jun 2017 12:38:10 +0000 (12:38 +0000)]
Revert "Disable in-place vdex update"
Reverting to only apply this when doing dexlayout.
PS1 is a pure revert. PS2 contains the fix.
This reverts commit
e446fede9258359b61d4c8753d7e96477fa29388.
Change-Id: I04a7dbde142d59e8dcdf4e93ab0456c4aa3d02ab
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
TreeHugger Robot [Mon, 5 Jun 2017 22:34:12 +0000 (22:34 +0000)]
Merge "Let the system process set the saturation boost"
Mark Renouf [Mon, 5 Jun 2017 21:59:01 +0000 (21:59 +0000)]
Merge "Clockwork: add feature android.software.input_methods" into oc-dev am:
eed865e61b
am:
73931bf207
Change-Id: Iabce8207d6ef63f2097c9a18fbafe26b85473f99
Mark Renouf [Mon, 5 Jun 2017 21:50:40 +0000 (21:50 +0000)]
Merge "Clockwork: add feature android.software.input_methods" into oc-dev
am:
eed865e61b
Change-Id: I8698f6f42fcbe2239493c6e03d8f850687c1de8c
Mark Renouf [Mon, 5 Jun 2017 21:42:59 +0000 (21:42 +0000)]
Merge "Clockwork: add feature android.software.input_methods" into oc-dev
Joel Fernandes [Mon, 5 Jun 2017 20:53:04 +0000 (20:53 +0000)]
Merge "atrace: Enable sched_waking if available" into oc-dev am:
4b37107002
am:
5d2e06c8a7
Change-Id: I6f9dd1f9299cbb7c92108e2964f3d19f3dc71f84
Joel Fernandes [Mon, 5 Jun 2017 20:52:31 +0000 (20:52 +0000)]
atrace: Set saved_cmdline_size to 8192 am:
efb73a96b5
am:
be83a34f7d
Change-Id: I062fccf47b3e549a125810e40bf7d28dab19f061
Romain Guy [Mon, 5 Jun 2017 20:51:43 +0000 (13:51 -0700)]
Let the system process set the saturation boost
The display manager service will need to call this code early
in the boot process, but before the hardware test calling permission
check can pass (it depends on the order of initalization of other
services like sensors).
Bug:
62238038
Test: Manual (modified display manager service)
Change-Id: I46a673ba971e566a0b9e023005c41fa54603cd1f
Joel Fernandes [Mon, 5 Jun 2017 20:46:31 +0000 (20:46 +0000)]
Merge "atrace: Enable sched_waking if available" into oc-dev
am:
4b37107002
Change-Id: I961c608a96040cfd87bd55249617c715cb6d6488
Joel Fernandes [Mon, 5 Jun 2017 20:46:07 +0000 (20:46 +0000)]
atrace: Set saved_cmdline_size to 8192
am:
efb73a96b5
Change-Id: I96758a6d56d5478b3287ead6c3d4e43fb7e61524
Joel Fernandes [Mon, 5 Jun 2017 20:41:07 +0000 (20:41 +0000)]
Merge "atrace: Enable sched_waking if available" into oc-dev
Joel Fernandes [Fri, 2 Jun 2017 17:19:28 +0000 (10:19 -0700)]
atrace: Set saved_cmdline_size to 8192
This increases the size of the table tracking comms and pids and
prevents overwriting them easily.
Bug:
38167231
Change-Id: I69b9000e4f9d0c2c7969efd38e02d8c1bffdad5c
Signed-off-by: Joel Fernandes <joelaf@google.com>
(cherry picked from commit
ed80bd04cc3bf80082b1d733ef06d90a29c6270a)
Joel Fernandes [Sun, 4 Jun 2017 20:05:59 +0000 (13:05 -0700)]
atrace: Enable sched_waking if available
sched_waking helps to know when a wakeup happens at the earliest.
wakeups can originate on different CPUs which makes it impossible to
know just from sched_wakeup what the source was. Thankfully sched_waking
is just for that, enable it if its available.
Bug:
36415990
Change-Id: I489ca0112d5e0ed781888866a9efa57f17ca8a53
Signed-off-by: Joel Fernandes <joelaf@google.com>
Joel Fernandes [Sun, 4 Jun 2017 20:05:59 +0000 (13:05 -0700)]
atrace: Enable sched_waking if available
sched_waking helps to know when a wakeup happens at the earliest.
wakeups can originate on different CPUs which makes it impossible to
know just from sched_wakeup what the source was. Thankfully sched_waking
is just for that, enable it if its available.
Bug:
36415990
Change-Id: I489ca0112d5e0ed781888866a9efa57f17ca8a53
Signed-off-by: Joel Fernandes <joelaf@google.com>
Chia-I Wu [Tue, 30 May 2017 21:54:08 +0000 (14:54 -0700)]
surfaceflinger: fix layer count
When a layer is removed, mLayerCount is always decremented by 1 even
though the layer has children. This commit fixes that by making
sure mLayerCount is properly decremented, and makes sure that a
parent layer must be a valid layer in mCurrentState.
Bug:
37121786
Test: manually open and close Camera app
Change-Id: I5a3e18be41646b167b4d361dfe08db4d06e1c2d0
(cherry picked from commit
98f1c108b016dda77c808f3d099e7a45bdd70768)
Chong Zhang [Sat, 3 Jun 2017 02:38:12 +0000 (02:38 +0000)]
Merge "Add media.codec process to native stack dump list" into oc-dev am:
eb30998a33
am:
edde8a79f0
Change-Id: I944e3e094aac18ebb859cc2e900ccf8b162357b4
TreeHugger Robot [Sat, 3 Jun 2017 02:34:30 +0000 (02:34 +0000)]
Merge "Setting queue metadata size via dvrSurface API"
Chong Zhang [Sat, 3 Jun 2017 02:29:45 +0000 (02:29 +0000)]
Merge "Add media.codec process to native stack dump list" into oc-dev
am:
eb30998a33
Change-Id: I8de97da46705f876848bfa939f05dc31f82389f2
TreeHugger Robot [Sat, 3 Jun 2017 02:19:50 +0000 (02:19 +0000)]
Merge "Add media.codec process to native stack dump list" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 00:59:36 +0000 (00:59 +0000)]
Merge "No crash from AHardwareBuffer_unlock on NULL fence"
Chong Zhang [Fri, 2 Jun 2017 23:13:16 +0000 (16:13 -0700)]
Add media.codec process to native stack dump list
This is needed for non-treble devices.
Test: do 'adb shell bugreport' on angler, and check that
'Cmd line: media.codec' section is present and stacks are there.
bug:
62297059
Change-Id: I2573bb48d021e7750adf44eb00f06f5b9efb3a85
Jiwen 'Steve' Cai [Fri, 2 Jun 2017 22:36:44 +0000 (15:36 -0700)]
Setting queue metadata size via dvrSurface API
This allows VRCore to use metadata feature on each individual DvrBufferQueue.
Bug:
62301995
Test: build, dvr_api-test
Change-Id: I8e0eb8ca1a2c197426c4853cae99a4ed63caeffe
Jiwen 'Steve' Cai [Fri, 2 Jun 2017 22:23:26 +0000 (15:23 -0700)]
No crash from AHardwareBuffer_unlock on NULL fence
The API document states: "If fence is not NULL then it will be set to a
file descriptor that is signaled when all pending work on the buffer is
completed." As it's too late to change the document, we should probably
update the implement and use GraphicsBuffer::unlock under the hood.
Bug:
62302267
Test: Build, AHardware CTS
Change-Id: Ic0fac5d7addfba67baaa1b5d7c221fc25d02df56
TreeHugger Robot [Fri, 2 Jun 2017 21:23:18 +0000 (21:23 +0000)]
Merge "Refactor how legacy dataspaces are decoded"
Robert Carr [Fri, 2 Jun 2017 20:52:06 +0000 (20:52 +0000)]
Merge changes I87a57825,I3721d163 into oc-dev am:
e44ea13766
am:
25bc953ae3
Change-Id: I9234764805e70a2e812520f0b02fa63fd4e70580
Robert Carr [Fri, 2 Jun 2017 20:44:36 +0000 (20:44 +0000)]
Merge changes I87a57825,I3721d163 into oc-dev
am:
e44ea13766
Change-Id: I258fd8dd5fd03975a28c606dcd022ef506554fb6
TreeHugger Robot [Fri, 2 Jun 2017 20:33:50 +0000 (20:33 +0000)]
Merge changes I87a57825,I3721d163 into oc-dev
* changes:
SurfaceFlinger: Fix final cropping of child layers.
SurfaceFlinger: Update parent pointer while performing transaction.
TreeHugger Robot [Fri, 2 Jun 2017 20:24:52 +0000 (20:24 +0000)]
Merge "libpdx: Fix bug in Variant type."
kenzyun_chen [Fri, 2 Jun 2017 19:58:39 +0000 (19:58 +0000)]
Merge "correct value of TYPE_MAGNIFICATION_OVERLAY" am:
9e94328e22 am:
ce9203d628 am:
d396aa6869
am:
5885883145
Change-Id: I89569cf2f3602cba8bb73dfca9a02e99d49fa33b
kenzyun_chen [Fri, 2 Jun 2017 19:54:33 +0000 (19:54 +0000)]
Merge "correct value of TYPE_MAGNIFICATION_OVERLAY" am:
9e94328e22 am:
ce9203d628
am:
d396aa6869
Change-Id: Ibffb945b0db31ac1a2ff053595e82476cc8a3fa4
kenzyun_chen [Fri, 2 Jun 2017 19:51:31 +0000 (19:51 +0000)]
Merge "correct value of TYPE_MAGNIFICATION_OVERLAY" am:
9e94328e22
am:
ce9203d628
Change-Id: I51e54f6e11287c98ff684616be91efcbfc7b2e1e
kenzyun_chen [Fri, 2 Jun 2017 19:48:02 +0000 (19:48 +0000)]
Merge "correct value of TYPE_MAGNIFICATION_OVERLAY"
am:
9e94328e22
Change-Id: I993c5680157f45e1912e7a24ae5ee1d6cd652f92
Treehugger Robot [Fri, 2 Jun 2017 19:40:44 +0000 (19:40 +0000)]
Merge "correct value of TYPE_MAGNIFICATION_OVERLAY"
Joel Fernandes [Fri, 2 Jun 2017 19:40:26 +0000 (19:40 +0000)]
Merge "atrace: Set saved_cmdline_size to 8192"
TreeHugger Robot [Fri, 2 Jun 2017 19:19:25 +0000 (19:19 +0000)]
Merge "Add saturation boost feature to SurfaceFlinger"
Robert Carr [Thu, 1 Jun 2017 23:11:34 +0000 (16:11 -0700)]
SurfaceFlinger: Fix final cropping of child layers.
Straightforward mistake documented by the test case. Not sure how it
made it this long.
Test: Included in Transaction_test.cpp. Manual from bug. go/wm-smoke.
Bug:
37511473
Change-Id: I87a57825cca879c5519fe72fef199168f7c23479
Robert Carr [Thu, 1 Jun 2017 21:59:25 +0000 (14:59 -0700)]
SurfaceFlinger: Update parent pointer while performing transaction.
To understand the change at a high level, notice that all the usage
of getParent() is assosciated with the drawing state. We see in this way
that the parent is a part of the drawing state and should only be updated
when transactions occurs.
More specifically we can consider the following scenario:
1. Imagine that we have a visible surface, with a visible child surface
2. Now imagine we create a new surface, which is hidden, and post a buffer to it.
It is configured such that it would be visible if it were not hidden.
3. We open a transaction
4. We reparent the child from the old surface to the new one
5. We show the new surface
6. We close the transaction
At this point we would expect the child to remain visible, as it is atomically
reparented with the visibility change of the parent. However prior to this CL
we see a flash, as the sequence can continue as follows:
7. Closing the transaction triggers setClientState, causing Layer::reparentChildren
which would call setParent updating the parent pointer.
8. setClientState updates the current but not drawing visibility of the new parent and marks
a transaction to occur.
9. We return to the main thread, MESSAGE_REFRESH occurs before MESSAGE_TRANSACTION
and we render a frame
10. We observe the child window as invisible, as it has the new parent
but it's new parent is not yet visible.
We simply have to ensure the parent pointer is updated at transaction time.
I chose a location in commitChildList where mDrawingChildren was copied
from mCurrentChildren as it seemed to express the intent well.
Test: Difficult to automatically test. Manually try resizing Chrome/Youtube/etc in docked stack before flicker should be ~1/10 after flicker should be <1/100 (I haven't seen one yet)
Bug:
62099658
Change-Id: I3721d16361b53128146510d3fda43e1c12f93223
Corey Tabaka [Thu, 1 Jun 2017 07:24:49 +0000 (00:24 -0700)]
libpdx: Fix bug in Variant type.
Fix a subtle bug in the Variant value destruction along the
EmptyVariant assignment path:
some_variant = EmptyVariant{};
The problem arises from the private utility method Destruct(),
which does not set the type index to "empty" after destroying the
current sub-element. For most paths this is okay because the type
index is immediately set to the new sub-element type. However, the
EmptyVariant path does not assign a new type because the Variant
should become empty. Since the type is not set to "empty" the
Variant incorrectly double destroys the previous value when a new
value is assigned.
Also clean up a superfluous overload of Assign() that is skipped
due to the stronger binding of the universal reference overload
Assign(T&&).
Update tests to properly cover this case. In the process discovered
two incorrect tests related to this issue and updated them.
Bug: None
Test: pdx_tests passes.
Change-Id: I106f863b34f2719820d04d0e701968332f659c3e
Courtney Goeltzenleuchter [Wed, 31 May 2017 23:51:45 +0000 (17:51 -0600)]
Refactor how legacy dataspaces are decoded
Test: adb shell dumpsys SurfaceFlinger
Observe that (deprecated) sRGB is decoded similar to how
newer dataspaces are decoded. Previous decoding added
extra bits in description that weren't helping.
Change-Id: Ic95a3a766f164f978d778d999f47252b83f79016
Courtney Goeltzenleuchter [Wed, 31 May 2017 23:56:46 +0000 (17:56 -0600)]
Remove redundent layer setDataspace calls.
Cache the layer's dataspace in hwc2 and only send
to the HAL when it changes. Allows HAL to optimize
use of layer.
Bug:
38396128
Test: Manually checked systraces on Pixel
Change-Id: Ia94bebe7de9f79d01ae19b9917591837d865fea9
Joel Fernandes [Fri, 2 Jun 2017 17:19:28 +0000 (10:19 -0700)]
atrace: Set saved_cmdline_size to 8192
This increases the size of the table tracking comms and pids and
prevents overwriting them easily.
Bug:
38167231
Change-Id: I69b9000e4f9d0c2c7969efd38e02d8c1bffdad5c
Signed-off-by: Joel Fernandes <joelaf@google.com>
Romain Guy [Thu, 1 Jun 2017 20:53:56 +0000 (13:53 -0700)]
Add saturation boost feature to SurfaceFlinger
Bug:
62238038
Test: adb shell service call SurfaceFlinger 1022 f 1.5
The saturation boost will be set by framework to increase
the visual appeal of the sRGB mode. It simply modifies the
color transform matrix based on the supplied value (from
0.0 for black and white to 2.0 for 100% extra saturation).
Change-Id: I9832fbe0361acacc8b17300c37c006792c6c1618
Narayan Kamath [Fri, 2 Jun 2017 13:49:32 +0000 (13:49 +0000)]
Merge "dumpstate: Further cleanups related to new stack dumping scheme."
kenzyun_chen [Fri, 2 Jun 2017 05:36:21 +0000 (13:36 +0800)]
correct value of TYPE_MAGNIFICATION_OVERLAY
It should be sync to the same value in WindowManager.java
or the InputWindowInfo::isTrustedOverlay() function will fail
Change-Id: I11bb518049724252f2795a6400efc17ddd545fbb
Mike Stroyan [Fri, 2 Jun 2017 00:56:18 +0000 (00:56 +0000)]
Merge "egl: handle failed eglMakeCurrent EGL_NO_CONTEXT" into oc-dev am:
2153f5e317
am:
0e00045ef4
Change-Id: I337051b245c5969a7611bfb5c2f07dc4aac5abbc
Mike Stroyan [Fri, 2 Jun 2017 00:48:35 +0000 (00:48 +0000)]
Merge "egl: handle failed eglMakeCurrent EGL_NO_CONTEXT" into oc-dev
am:
2153f5e317
Change-Id: I6c36e59dc595bd6a494561a49b98b0f2d479ecfe
TreeHugger Robot [Fri, 2 Jun 2017 00:42:59 +0000 (00:42 +0000)]
Merge "egl: handle failed eglMakeCurrent EGL_NO_CONTEXT" into oc-dev
David Sehr [Thu, 1 Jun 2017 22:27:10 +0000 (22:27 +0000)]
Disable in-place vdex update am:
3291cd9eaa
am:
1b8bd96ef8
Change-Id: I0389d08b4c6e32e10c9ee83d7177409bff98e270
David Sehr [Thu, 1 Jun 2017 22:21:02 +0000 (22:21 +0000)]
Disable in-place vdex update
am:
3291cd9eaa
Change-Id: I9289c4cd1dea5299c842a935943101370ca609e4
Andreas Gampe [Thu, 1 Jun 2017 22:04:50 +0000 (22:04 +0000)]
Merge "Installd: deleteOdex's outputPath can be null" am:
0c189de962 am:
6f0d10dbde am:
084434a475
am:
902bf61f51
Change-Id: Ib790d04fb59565ea6737a215deb95ddac30a195a
Andreas Gampe [Thu, 1 Jun 2017 21:58:32 +0000 (21:58 +0000)]
Merge "Installd: deleteOdex's outputPath can be null" am:
0c189de962 am:
6f0d10dbde
am:
084434a475
Change-Id: I50dc3cfa3f19ae0bc45269b1f15a45a6328106b9
Andreas Gampe [Thu, 1 Jun 2017 21:56:00 +0000 (21:56 +0000)]
Merge "Installd: deleteOdex's outputPath can be null" am:
0c189de962
am:
6f0d10dbde
Change-Id: Id73731fd8d7e2e67d17f9ac3599d27520849ac2c
Andreas Gampe [Thu, 1 Jun 2017 21:52:59 +0000 (21:52 +0000)]
Merge "Installd: deleteOdex's outputPath can be null"
am:
0c189de962
Change-Id: I2220e465027a31b84a9bb473e18e4cfd4fdb0dc7
Treehugger Robot [Thu, 1 Jun 2017 21:49:25 +0000 (21:49 +0000)]
Merge "Installd: deleteOdex's outputPath can be null"
TreeHugger Robot [Thu, 1 Jun 2017 21:06:39 +0000 (21:06 +0000)]
Merge "Sync up the DvrConfig struct with Google3"
Mike Stroyan [Thu, 1 Jun 2017 19:56:18 +0000 (13:56 -0600)]
egl: handle failed eglMakeCurrent EGL_NO_CONTEXT
The recovery code for failed eglMakeCurrent didn't correctly
handle the case when the previous context was EGL_NO_CONTEXT.
Leave the original EGL context unrestored in that case.
The driver should be able to handle that case without help.
Bug:
38341617,
37244059
Change-Id: I38f3450005a4eec5f1a684ee7d66363e88f6d92f
Fixes:
38341617
Test: android.server.cts.ActivityManagerDisplayTests, Run Minions Rush app.
David Sehr [Fri, 26 May 2017 23:32:55 +0000 (16:32 -0700)]
Disable in-place vdex update
Vdex files can be corrupted by dexlayout or by previously dexlayout-ed
files being recompiled if they are used as both input and output.
Disable this feature.
Bug:
38113240
Test: OTA and dexopt
Change-Id: Iee2d9a6c1ba8cddda25290f68f50649d5288d588
(cherry picked from commit
e446fede9258359b61d4c8753d7e96477fa29388)
Okan Arikan [Thu, 1 Jun 2017 20:10:02 +0000 (20:10 +0000)]
Merge "Add dvrBufferGlobalLayoutVersion which returns the version number for the global buffers."
Narayan Kamath [Thu, 1 Jun 2017 17:50:12 +0000 (18:50 +0100)]
dumpstate: Further cleanups related to new stack dumping scheme.
- Rewrite AddDumpFds to iterate over all files in the dump directory
instead of assuming a specific file pattern. This gives us additional
flexibility in generating dump file names.
- Fix a bug in deducing the value of is_global_stack_trace_file.
- Add a better section header for the most recent ANR dump. The most
recent dump will be titled "VM TRACES AT LAST ANR" and all others will
be titled "HISTORICAL ANR". Also fixes the sort order so that the most
recent ANR shows up first.
Bug:
36024548
Test: Manual; adb bugreport
Change-Id: I461712954d033ef3a3911d5b419a101cac71c8fb
Romain Guy [Thu, 1 Jun 2017 19:07:33 +0000 (19:07 +0000)]
Merge "Fix the build"
Romain Guy [Thu, 1 Jun 2017 19:05:21 +0000 (12:05 -0700)]
Fix the build
Bug: n/a
Test: compile
Change-Id: I39179d83ae748434dcfd2043143e7154053071d7
Okan Arikan [Wed, 31 May 2017 21:48:30 +0000 (14:48 -0700)]
Sync up the DvrConfig struct with Google3
Bug:
38506720
Test: No functional change. Just make.
Change-Id: Ib159dd156cef353a7881bc6b4004c46da5e2d449
Mark Renouf [Thu, 1 Jun 2017 18:43:41 +0000 (14:43 -0400)]
Clockwork: add feature android.software.input_methods
BUG:
38123013
Change-Id: I4532cefda9c24541450f5e0e739ab5d44c1111fd
Chia-I Wu [Thu, 1 Jun 2017 18:11:40 +0000 (18:11 +0000)]
Merge "surfaceflinger: fix layer count"
TreeHugger Robot [Thu, 1 Jun 2017 18:10:40 +0000 (18:10 +0000)]
Merge "Use wide gamut only when necessary"
Andreas Gampe [Thu, 1 Jun 2017 18:06:25 +0000 (18:06 +0000)]
Installd: deleteOdex's outputPath can be null am:
c523409f0f
am:
7b28d34ee2
Change-Id: I8d700639d5056dd68b41e01b994f074dafe9bedc
Andreas Gampe [Thu, 1 Jun 2017 17:59:50 +0000 (17:59 +0000)]
Installd: deleteOdex's outputPath can be null
am:
c523409f0f
Change-Id: I36aa3e4c04967567e1f1cfa5f967be416bdeca8e
Andreas Gampe [Wed, 31 May 2017 23:39:58 +0000 (16:39 -0700)]
Installd: deleteOdex's outputPath can be null
Add @nullable, as the outputPath can be null for system apps.
(cherry picked from commit
c523409f0fd03aa498cedc486f85e9a4b7257f3a)
Bug:
62236497
Test: m
Test: Fill up /data, apply OTA
Change-Id: I61d86721b485f85195b153d76ce25412dcb68be6
Okan Arikan [Wed, 31 May 2017 21:25:51 +0000 (14:25 -0700)]
Add dvrBufferGlobalLayoutVersion which returns the version number for
the global buffers.
Bug:
62228826
Test: dvrBufferGlobalLayoutVersion == kSharedBufferLayoutVersion
Change-Id: I08eaca128ea5c84739924ab839651088e10c65bc
Nicolas Geoffray [Thu, 1 Jun 2017 15:56:06 +0000 (15:56 +0000)]
Delete vdex file in delete_odex. am:
3040d9db98
am:
eea2061b34
Change-Id: I20ecc830c5607a24be3f194bf665618e8091b6ad
Nicolas Geoffray [Thu, 1 Jun 2017 15:53:10 +0000 (15:53 +0000)]
Delete vdex file in delete_odex.
am:
3040d9db98
Change-Id: I5382e82ebf64bf8fc409cb3ba4cb1481cdca0e58
Andreas Gampe [Wed, 31 May 2017 23:39:58 +0000 (16:39 -0700)]
Installd: deleteOdex's outputPath can be null
Add @nullable, as the outputPath can be null for system apps.
Bug:
62236497
Test: m
Test: Fill up /data, apply OTA
Change-Id: I61d86721b485f85195b153d76ce25412dcb68be6
Nicolas Geoffray [Thu, 25 May 2017 12:58:06 +0000 (13:58 +0100)]
Delete vdex file in delete_odex.
(cherry picked from commit
192fb9662ce8b2a60da2b280d8000283fb3b6f6b)
bug:
38513395
Test: unfortunately no unit test here, so after discussing
with agampe@ just relied on build.
Change-Id: I305ddaadc813673fb55473f5e8ca357f39cf98f3
Chia-I Wu [Tue, 30 May 2017 21:54:08 +0000 (14:54 -0700)]
surfaceflinger: fix layer count
When a layer is removed, mLayerCount is always decremented by 1 even
though the layer has children. This commit fixes that by making
sure mLayerCount is properly decremented, and makes sure that a
parent layer must be a valid layer in mCurrentState.
Bug:
37121786
Test: manually open and close Camera app
Change-Id: I5a3e18be41646b167b4d361dfe08db4d06e1c2d0
TreeHugger Robot [Thu, 1 Jun 2017 14:48:56 +0000 (14:48 +0000)]
Merge "Add documentation for the dvr_hardware_composer_client"
Narayan Kamath [Thu, 25 May 2017 12:20:39 +0000 (13:20 +0100)]
dumpstate: use tombstoned/debuggerd for java traces.
- debuggerd_dump_traces now supports Java traces as well, so
use that when dalvik.vm.stack-trace-dir is set. The output
FD we use for the intercept is currently a regular file
written by mkostemp, but this can be cleaned up once the
old way of doing things is removed.
- We're no longer writing traces to a global trace file, so
add bug report entries for all java traces written in the past
30 minutes just as we do for native traces.
The minor refactoring that this CL undertakes was done under the
assumption that the old way of doing things will be removed in the
near future.
Bug:
32064548
Test: manual
Change-Id: I8af6f0a644115296dc41affc3b7cd98a2db32c48
TreeHugger Robot [Thu, 1 Jun 2017 06:27:16 +0000 (06:27 +0000)]
Merge "Remove error when trying to get a global buffer that doesn't exist"
Dan Stoza [Thu, 1 Jun 2017 06:23:36 +0000 (06:23 +0000)]
libgui: Add Surface::getLastDequeueStartTime am:
932f008485
am:
46b9841653
Change-Id: Id3dd6920b3341c5675b5308a9c80e276a5b03ce2
Dan Stoza [Thu, 1 Jun 2017 06:16:33 +0000 (06:16 +0000)]
libgui: Add Surface::getLastDequeueStartTime
am:
932f008485
Change-Id: I77404c1b97cb997a057558362b9bfdf9df65c8da
Romain Guy [Thu, 1 Jun 2017 02:22:30 +0000 (19:22 -0700)]
Use wide gamut only when necessary
Set the dataspace of the screenshot based on the result of
the composition. When no wide gamut app is visible, the screenshot
will be in sRGB, otherwise in Display P3. On device that do not
support wide gamut, the color space will be unknown (native).
Bug:
29940137
Test: screencap and Android Studio
Change-Id: I93f3f8e5afebb9f3f17b835fdf5bc215b0856d55
David Sehr [Wed, 31 May 2017 22:17:54 +0000 (22:17 +0000)]
Merge "Disable in-place vdex update" am:
d9917d78a0 am:
2521871a1f am:
b8e9326fd8
am:
8425a02d5c
Change-Id: I7ca8d02b2e43ae1a2d69aeb0551f7297f6da83ee
David Sehr [Wed, 31 May 2017 22:15:04 +0000 (22:15 +0000)]
Merge "Disable in-place vdex update" am:
d9917d78a0 am:
2521871a1f
am:
b8e9326fd8
Change-Id: Ia2297f8cc31830e4e3909580f3af45dfb96e5901
David Sehr [Wed, 31 May 2017 22:10:23 +0000 (22:10 +0000)]
Merge "Disable in-place vdex update" am:
d9917d78a0
am:
2521871a1f
Change-Id: I9c4d606bcb054ad96b28a4da76a7ddf241d8687b
David Sehr [Wed, 31 May 2017 22:08:21 +0000 (22:08 +0000)]
Merge "Disable in-place vdex update"
am:
d9917d78a0
Change-Id: Ieb4a1235dc99cac32b6fb441ee98e0cbdf4b7661