OSDN Git Service
TreeHugger Robot [Thu, 27 Oct 2016 22:09:21 +0000 (22:09 +0000)]
Merge "Add modem logs to the bugreport"
Naveen Kalla [Thu, 20 Oct 2016 04:38:44 +0000 (21:38 -0700)]
Add modem logs to the bugreport
When user takes bug report, collect modem logs and add it to the
bugreport zip file.
Test: Take Bugreport and ensure that the modem logs are present
in userdebug builds. Also check that bug reports are collected
normally if there are no modem logs.
BUG=
32219165
Change-Id: Ia20fc95ceee95972e17ac4193d350bbae36b3630
Wei Wang [Thu, 27 Oct 2016 18:29:35 +0000 (18:29 +0000)]
Merge "TextOutput log improvement" am:
3e9e757437 am:
1ccb872a9e am:
1136e487b7
am:
a38cde50db
Change-Id: Id31e8949a2d8aa6edaae816c790c955e335bd56a
Wei Wang [Thu, 27 Oct 2016 18:24:35 +0000 (18:24 +0000)]
Merge "TextOutput log improvement" am:
3e9e757437 am:
1ccb872a9e
am:
1136e487b7
Change-Id: I29c8813ea1bcac32971925f53b277682ed2f948a
Wei Wang [Thu, 27 Oct 2016 18:19:05 +0000 (18:19 +0000)]
Merge "TextOutput log improvement" am:
3e9e757437
am:
1ccb872a9e
Change-Id: Ic9efec9193ed37c7bbfca966c07224b9e96349fb
Connor O'Brien [Thu, 27 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am:
06d83ad741 am:
12a04a524b am:
ea4dfd2f0d
am:
6bb878f9aa
Change-Id: I0be634aec218d99d57a81655397dac3f777e4565
Wei Wang [Thu, 27 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Merge "TextOutput log improvement"
am:
3e9e757437
Change-Id: I88fec0002898ec7da19d579d0aa4679b73bfcd53
Connor O'Brien [Thu, 27 Oct 2016 18:09:33 +0000 (18:09 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am:
06d83ad741 am:
12a04a524b
am:
ea4dfd2f0d
Change-Id: I3485f6010a1090e4d709fb920b06b68a7d1cbb0a
Treehugger Robot [Thu, 27 Oct 2016 18:05:46 +0000 (18:05 +0000)]
Merge "TextOutput log improvement"
Connor O'Brien [Thu, 27 Oct 2016 18:05:03 +0000 (18:05 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am:
06d83ad741
am:
12a04a524b
Change-Id: I4f5d47d6d239d0df4b8e994645cd5bde4e45b88f
Connor O'Brien [Thu, 27 Oct 2016 18:00:33 +0000 (18:00 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"
am:
06d83ad741
Change-Id: I4df9c55a81801972f1b4cbb56f11d24f5bbc9e1d
Connor O'Brien [Thu, 27 Oct 2016 17:54:14 +0000 (17:54 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"
Connor O'Brien [Thu, 27 Oct 2016 00:58:51 +0000 (17:58 -0700)]
Enable multiple concurrent binderLibTest instances
Each instance tries to register a service with the
same name, so suffix the service name with the
instance's PID to avoid collisions.
Test: Tests run and pass in 2 processes at once
Change-Id: I685b01fbfbad4e9bd3eb6ea06f46ffc157169909
Signed-off-by: Connor O'Brien <connoro@google.com>
Colin Cross [Wed, 26 Oct 2016 23:42:21 +0000 (23:42 +0000)]
Merge "Replace surfaceflinger protobufs with protobuf-lite"
Colin Cross [Wed, 26 Oct 2016 19:52:53 +0000 (12:52 -0700)]
Replace surfaceflinger protobufs with protobuf-lite
Use lite protobufs for surfaceflinger to remove dependency on
libprotobuf-cpp-full, which will be removed from the platform.
Bug:
32417805
Test: builds
Change-Id: Ie27b253a2f6c1b296c4ae7c7cb056cd3c4c0dde6
TreeHugger Robot [Wed, 26 Oct 2016 18:00:49 +0000 (18:00 +0000)]
Merge "TextOutput log improvement"
Ruben Brunk [Wed, 26 Oct 2016 00:35:09 +0000 (00:35 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32 am:
323f83ef75 am:
4466e11fd4
am:
82ecb9094c
Change-Id: I0af3a3da502c92d89fe56a83c35459460a81e431
Ruben Brunk [Wed, 26 Oct 2016 00:34:55 +0000 (00:34 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b am:
f0f8f0a99d am:
f27cfdd82e
am:
b3d7a8c895
Change-Id: I9838611119c1b1ee75496548e6b2ad433ef2fdbe
Ruben Brunk [Wed, 26 Oct 2016 00:31:07 +0000 (00:31 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32 am:
323f83ef75
am:
4466e11fd4
Change-Id: I8577f7b46f6c53db78058c759fcfa0905ac73e8f
Ruben Brunk [Wed, 26 Oct 2016 00:30:52 +0000 (00:30 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b am:
f0f8f0a99d
am:
f27cfdd82e
Change-Id: Ibe09a9e433ec8e18ce39d9369be3ce4e671a2e4d
Ruben Brunk [Wed, 26 Oct 2016 00:27:33 +0000 (00:27 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32
am:
323f83ef75
Change-Id: I7f7ba9248fb860fb82522920d9befb443ebea88a
Ruben Brunk [Wed, 26 Oct 2016 00:27:21 +0000 (00:27 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b
am:
f0f8f0a99d
Change-Id: I9c6f99532804546911f81b3e03faed63b652c00f
Ruben Brunk [Wed, 26 Oct 2016 00:23:04 +0000 (00:23 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev
am:
4e1d67bd32
Change-Id: I951313d72530540077a777406754ab97a4566d72
Ruben Brunk [Wed, 26 Oct 2016 00:22:50 +0000 (00:22 +0000)]
Do not set VR mode feature as handset default.
am:
5ce292f55b
Change-Id: I913dc6997a275c90b0617c0a785e3991a947bc22
Ruben Brunk [Wed, 26 Oct 2016 00:15:11 +0000 (00:15 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev
Steve Pfetsch [Tue, 25 Oct 2016 22:31:15 +0000 (22:31 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am:
103ba31665 am:
b3f571bc1e am:
72b05e9e96
am:
479b9f9ddc
Change-Id: Ida277d532ddbb79bdbd44d98d2ec1e3cb8be54e9
Steve Pfetsch [Tue, 25 Oct 2016 22:31:03 +0000 (22:31 +0000)]
Revert "services: surfaceflinger: ASAN fix" am:
598f6d5429 am:
d5156b70ff am:
12924419de
am:
6d2eb659a5
Change-Id: I609bac956dff460334942bd348c0eedc53a42123
Steve Pfetsch [Tue, 25 Oct 2016 22:23:16 +0000 (22:23 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am:
103ba31665 am:
b3f571bc1e
am:
72b05e9e96
Change-Id: I57bc57e60f654471d92271796b6e099b544760fd
Steve Pfetsch [Tue, 25 Oct 2016 22:23:03 +0000 (22:23 +0000)]
Revert "services: surfaceflinger: ASAN fix" am:
598f6d5429 am:
d5156b70ff
am:
12924419de
Change-Id: I520fff2e1cc9b3a49478cbc9e783df081defc75d
Steve Pfetsch [Tue, 25 Oct 2016 22:13:39 +0000 (22:13 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am:
103ba31665
am:
b3f571bc1e
Change-Id: Iddae1b7f6acf45da61a74622947153cf282e6a91
Steve Pfetsch [Tue, 25 Oct 2016 22:13:26 +0000 (22:13 +0000)]
Revert "services: surfaceflinger: ASAN fix" am:
598f6d5429
am:
d5156b70ff
Change-Id: I35366694c5518390d49d803806955fc85bfc34f2
Steve Pfetsch [Tue, 25 Oct 2016 22:05:01 +0000 (22:05 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev
am:
103ba31665
Change-Id: Ic40bef2b672597ad00b4b106410c4347b556998b
Steve Pfetsch [Tue, 25 Oct 2016 22:05:00 +0000 (22:05 +0000)]
Revert "services: surfaceflinger: ASAN fix"
am:
598f6d5429
Change-Id: Ic7f8483308c1f553e1614c8d1624583c9c472423
Steve Pfetsch [Tue, 25 Oct 2016 21:54:41 +0000 (21:54 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev
Steve Pfetsch [Tue, 25 Oct 2016 21:47:58 +0000 (21:47 +0000)]
Revert "services: surfaceflinger: ASAN fix"
This reverts commit
1d3df546d5ee4dcc9e7cae6f8b8b790f741539af.
Original patch may have caused a stability issue caught in monkey testing.
Bug:
32312240
Change-Id: Ie8d291679590e624b8b90c4786b1c25c76cb2c9f
Felipe Leme [Tue, 25 Oct 2016 21:27:04 +0000 (21:27 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am:
7781eccbc3 am:
dca861e167 am:
f97bd91368
am:
98cf2f775d -s ours
Change-Id: Ie79e1b5076e45c2975a437b35852ca28e18f11e5
Felipe Leme [Tue, 25 Oct 2016 21:26:50 +0000 (21:26 +0000)]
resolve merge conflicts of
a97a282 to nyc-mr2-dev-plus-aosp
am:
257cdc33db -s ours
Change-Id: I57d67a5bf83f3f8385a6bef98ef8a5c63f577f79
Felipe Leme [Tue, 25 Oct 2016 21:18:59 +0000 (21:18 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am:
7781eccbc3 am:
dca861e167
am:
f97bd91368
Change-Id: Ie01cd86bfb242b2e02ba55ecffad9c99a2ab962b
Felipe Leme [Tue, 25 Oct 2016 21:13:13 +0000 (14:13 -0700)]
resolve merge conflicts of
a97a282 to nyc-mr2-dev-plus-aosp
BUG:
32365477
Change-Id: I8075346262e94ca64b144a42f2e886496ffff62c
Felipe Leme [Tue, 25 Oct 2016 20:54:39 +0000 (20:54 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am:
7781eccbc3
am:
dca861e167
Change-Id: I3f03bee749bde460029a6f27ad57897fe4b38115
Felipe Leme [Tue, 25 Oct 2016 20:54:26 +0000 (20:54 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time." am:
bb6b604623
am:
dfc9df466f
Change-Id: I811887b84ada7e44745548064926f0bfd9f3ad57
Felipe Leme [Tue, 25 Oct 2016 20:49:46 +0000 (20:49 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev
am:
7781eccbc3
Change-Id: If9f104497a20203c6fd854091082672826857b52
Felipe Leme [Tue, 25 Oct 2016 20:49:45 +0000 (20:49 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."
am:
bb6b604623
Change-Id: I08b640b8c1ffae80205be5dcf179403c335e43ba
TreeHugger Robot [Tue, 25 Oct 2016 20:44:14 +0000 (20:44 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev
Felipe Leme [Tue, 25 Oct 2016 18:18:24 +0000 (18:18 +0000)]
DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."
This reverts commit
f87959e00732d7d737527f1248a71adea99ae29d.
BUG:
32402587
Fixes:
32365477
Change-Id: Ic4daec37efbaef1906450bf6609d5588d5c9a835
Ruben Brunk [Tue, 25 Oct 2016 01:28:46 +0000 (18:28 -0700)]
Do not set VR mode feature as handset default.
Bug:
31959453
Change-Id: I6fef6781e14f3c1239197798b79cc9239d34d53d
Colin Cross [Mon, 24 Oct 2016 18:13:54 +0000 (18:13 +0000)]
Merge "[binder]: Correct the index for getReturnString" am:
a340838895 am:
3a3ed21bac am:
218d4e6ce5
am:
22e91a5b8f
Change-Id: Ief9ebb3d80d134d964a3011141da0196c16f87fd
Colin Cross [Mon, 24 Oct 2016 18:09:54 +0000 (18:09 +0000)]
Merge "[binder]: Correct the index for getReturnString" am:
a340838895 am:
3a3ed21bac
am:
218d4e6ce5
Change-Id: Ibbe6406b6feff62dce7193c13de0bbaacceb48a8
Colin Cross [Mon, 24 Oct 2016 18:06:24 +0000 (18:06 +0000)]
Merge "[binder]: Correct the index for getReturnString" am:
a340838895
am:
3a3ed21bac
Change-Id: I155907b463d85dee5327c1b1df47be6d6c5cc3c9
Colin Cross [Mon, 24 Oct 2016 18:02:53 +0000 (18:02 +0000)]
Merge "[binder]: Correct the index for getReturnString"
am:
a340838895
Change-Id: Ide173ea019cceaba9eee1c25edf9fea75acc6caa
Colin Cross [Mon, 24 Oct 2016 17:58:14 +0000 (17:58 +0000)]
Merge "[binder]: Correct the index for getReturnString"
Wei Wang [Fri, 21 Oct 2016 06:18:17 +0000 (23:18 -0700)]
TextOutput log improvement
Add unit tests for log functions
Add support of std::endl
Add back support of char
Add back support of bool
Add back support of String16
Fix a build warning on union initialization
Test: run /data/nativetest(64)/binderTextOutputTest
Bug:
32181382
Change-Id: I4030b142beacc5dcd88a10904710fd6e19f7240c
Wei Wang [Fri, 21 Oct 2016 06:18:17 +0000 (23:18 -0700)]
TextOutput log improvement
Add unit tests for log functions
Add support of std::endl
Add back support of char
Add back support of bool
Add back support of String16
Fix a build warning on union initialization
Test: run /data/nativetest(64)/binderTextOutputTest
Bug:
32181382
Change-Id: I4030b142beacc5dcd88a10904710fd6e19f7240c
Felipe Leme [Fri, 21 Oct 2016 23:59:18 +0000 (23:59 +0000)]
DO NOT MERGE. Added a is_zipping() function. am:
03974984bf am:
40e091cd8f
am:
7a7c28a4aa -s ours
Change-Id: Iaeb9aea29bb5b11a49eb55af3eb0d9238bba038b
Felipe Leme [Fri, 21 Oct 2016 23:56:18 +0000 (23:56 +0000)]
DO NOT MERGE. Added a is_zipping() function. am:
03974984bf
am:
40e091cd8f
Change-Id: Ia9e559632ea3c5e37063e1433c2a7928f8313625
Felipe Leme [Fri, 21 Oct 2016 23:53:47 +0000 (23:53 +0000)]
DO NOT MERGE. Added a is_zipping() function.
am:
03974984bf
Change-Id: Ib14224bf42315b3b1633662fac1f88610a824296
TreeHugger Robot [Fri, 21 Oct 2016 19:34:20 +0000 (19:34 +0000)]
Merge changes I46ec4bca,I64c00f3b
* changes:
Sets dumpstate version using system properties.
Fixed variable names according to Google C++ style.
Felipe Leme [Fri, 21 Oct 2016 18:38:26 +0000 (11:38 -0700)]
DO NOT MERGE. Added a is_zipping() function.
BUG:
32219165
Fixes:
32335112
Change-Id: I2bc630f9c840ccd3a2e0474ed16a766e8a405ad8
Mark Salyzyn [Fri, 21 Oct 2016 18:31:39 +0000 (11:31 -0700)]
resolve merge conflicts of
91cc63a to master
Test: None
Bug:
31750617
Change-Id: Iace66f74cc0624064e536ef98707701f8e060701
Mark Salyzyn [Fri, 21 Oct 2016 18:16:22 +0000 (18:16 +0000)]
Merge "dumpstate: Use private interfaces for buffer size properties" am:
430b3667ec
am:
439dbe3bc3
Change-Id: Ia996de428a869552937ec690b4d02af7611c2bc1
Mark Salyzyn [Fri, 21 Oct 2016 18:08:51 +0000 (18:08 +0000)]
Merge "dumpstate: Use private interfaces for buffer size properties"
am:
430b3667ec
Change-Id: I150663d5108340f1434f8ec48eb6cd9d4722603f
Mark Salyzyn [Fri, 21 Oct 2016 18:02:12 +0000 (18:02 +0000)]
Merge "dumpstate: Use private interfaces for buffer size properties"
songjinshi [Tue, 18 Oct 2016 13:05:56 +0000 (21:05 +0800)]
[binder]: Correct the index for getReturnString
The cmd code can not as the index drectly.
Change-Id: Icddad46faef7a77acbd7edf118c081ac10501f47
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Felipe Leme [Thu, 20 Oct 2016 23:48:00 +0000 (16:48 -0700)]
Sets dumpstate version using system properties.
Android N introduced a '-V' argument to change dumpstate's version, but
such argument can only be used when running dumpstate directly (as
root).
This CL uses a system property instead (dumpstate.version), so different
versions can be used while taking bugreports.
It also introduces a '-v' argument line to display the dumpstate header,
and removes the redundant dry_run check from _dump_file_from_fd().
Test: DumpstateTest passes
Change-Id: I46ec4bca133d16d8431358bb9f16eb89bb082be1
Felipe Leme [Thu, 20 Oct 2016 22:10:33 +0000 (15:10 -0700)]
Fixed variable names according to Google C++ style.
Trivia question: what do you get when Java developers refactor C into C++?
Anser: a_bigMess
BUG:
26379932
Test: DumpstateTest passes
Change-Id: I64c00f3b5953f077fb646cdc45a1656060a4b46e
Mark Salyzyn [Tue, 27 Sep 2016 21:55:27 +0000 (14:55 -0700)]
dumpstate: Use private interfaces for buffer size properties
Used to estimate the timeout to be applied to the logcat command.
This transition represents some technical debt and optimization.
Test: collect bugreport and confirm logcat output
Bug:
31750617
Bug:
21555259
Change-Id: I512b969a4a796fce468907494814315e30c5299d
Dan Albert [Thu, 20 Oct 2016 22:31:49 +0000 (22:31 +0000)]
Merge "Add licenses to ndk_headers." am:
8c9cd8a215 am:
1bef51ae50
am:
494979faf9
Change-Id: I8df2571df3b2a7fd065ce3c1d98febebba76bfe2
Dan Albert [Thu, 20 Oct 2016 22:24:07 +0000 (22:24 +0000)]
Merge "Add licenses to ndk_headers." am:
8c9cd8a215
am:
1bef51ae50
Change-Id: I862f1bbe3552645cf7a1437d986c3620a1bdb0f5
Dan Albert [Thu, 20 Oct 2016 22:16:56 +0000 (22:16 +0000)]
Merge "Add licenses to ndk_headers."
am:
8c9cd8a215
Change-Id: I6a49ab856d6f52597067be0df5e34b9459efdb33
Treehugger Robot [Thu, 20 Oct 2016 22:12:39 +0000 (22:12 +0000)]
Merge "Add licenses to ndk_headers."
TreeHugger Robot [Thu, 20 Oct 2016 20:08:03 +0000 (20:08 +0000)]
Merge "Refactor zip functions and state into Dumpstate class."
TreeHugger Robot [Thu, 20 Oct 2016 18:25:53 +0000 (18:25 +0000)]
Merge "Minor dumpstate refactorings:"
Dan Albert [Thu, 20 Oct 2016 17:14:30 +0000 (10:14 -0700)]
Add licenses to ndk_headers.
Test: make ndk
Bug: None
Change-Id: Ia113ea42b1d62d87dfbb2fc456428c7db50a98f1
Wei Wang [Thu, 20 Oct 2016 17:05:56 +0000 (17:05 +0000)]
Merge "Fix log function for potential overflow" am:
2e5c7798e1 am:
10155def9a
am:
0b0f69aecb
Change-Id: Ie45cdddbf69261564c11cd2c8c781ef2391e500e
Wei Wang [Thu, 20 Oct 2016 16:57:24 +0000 (16:57 +0000)]
Merge "Fix log function for potential overflow" am:
2e5c7798e1
am:
10155def9a
Change-Id: Ia91d711168bf9e69c583b1a933d69de94916b449
Felipe Leme [Sat, 15 Oct 2016 01:06:47 +0000 (18:06 -0700)]
Refactor zip functions and state into Dumpstate class.
BUG:
26379932
Test: DumpstateTest passes
Change-Id: I8525b81c9239287a108aa6222048fa6171ddb15d
Wei Wang [Thu, 20 Oct 2016 16:49:03 +0000 (16:49 +0000)]
Merge "Fix log function for potential overflow"
am:
2e5c7798e1
Change-Id: I17a6c6a035e6e85777d0f14db819452d770856ae
Wei Wang [Thu, 20 Oct 2016 16:41:20 +0000 (16:41 +0000)]
Merge "Fix log function for potential overflow"
Wei Wang [Wed, 19 Oct 2016 17:23:59 +0000 (10:23 -0700)]
Fix log function for potential overflow
On LP64 system, unsigned long can be 64bit
Also clean out unused static variables.
Test: flash on ARM64 device
Bug:
32181382
Change-Id: I44b7ea8a6588c475a3979d7bddeb08da7f54c27a
Wei Wang [Thu, 20 Oct 2016 03:48:22 +0000 (03:48 +0000)]
Merge "Fix log function for potential overflow"
Wei Wang [Wed, 19 Oct 2016 17:23:59 +0000 (10:23 -0700)]
Fix log function for potential overflow
On LP64 system, unsigned long can be 64bit
Also clean out unused static variables.
Test: flash on ARM64 device
Bug:
32181382
Change-Id: I44b7ea8a6588c475a3979d7bddeb08da7f54c27a
Fabien Sanglard [Wed, 19 Oct 2016 22:46:51 +0000 (22:46 +0000)]
Merge "Delete RenderEngine path for OpenGL ES 1.0/1.1"
Chong Zhang [Thu, 13 Oct 2016 00:09:48 +0000 (17:09 -0700)]
IOMX: adding OMX_IndexParamMaxFrameDurationForBitrateControl
Also adding end tag for index groups where we explictly validate.
bug:
31399200
Change-Id: I164ea60258bae809dd4ff389f2480add926a9c4b
Elliott Hughes [Wed, 19 Oct 2016 15:26:11 +0000 (15:26 +0000)]
Merge "Rely on the platform -std default."
Steve Pfetsch [Wed, 19 Oct 2016 05:08:49 +0000 (05:08 +0000)]
services: surfaceflinger: ASAN fix am:
1d3df546d5 am:
ff06017cfe
am:
409c087ffe
Change-Id: Ia0a821a314c9bc5582cef8f434a77115599263e2
Steve Pfetsch [Wed, 19 Oct 2016 05:01:18 +0000 (05:01 +0000)]
services: surfaceflinger: ASAN fix am:
1d3df546d5
am:
ff06017cfe
Change-Id: Ie1f5418312cffc6b1a1ec9a7fd0194babaf9d6d9
Steve Pfetsch [Wed, 19 Oct 2016 04:53:17 +0000 (04:53 +0000)]
services: surfaceflinger: ASAN fix
am:
1d3df546d5
Change-Id: If0447f27ab0a1c3033b0a87fc8426f53c2a82ac5
Steve Pfetsch [Fri, 30 Sep 2016 00:16:29 +0000 (17:16 -0700)]
services: surfaceflinger: ASAN fix
Move layer removal to the main thread, while the display is on.
Bug:
30281222
Change-Id: Id9f956c1e626819734868340e7fa12abf257b702
Dan Willemsen [Tue, 18 Oct 2016 23:50:46 +0000 (23:50 +0000)]
Merge "Convert to Android.bp" am:
99de09fe7f -s ours am:
cc3c973f5f -s ours
am:
c438a959e1 -s ours
Change-Id: Id252ea9d5bce15fe7ca3c4a52a04113664b4db24
Dan Willemsen [Tue, 18 Oct 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Convert to Android.bp" am:
99de09fe7f -s ours
am:
cc3c973f5f -s ours
Change-Id: I825715a956f44a0b4371a1526a054c05fac05326
Dan Willemsen [Tue, 18 Oct 2016 23:36:42 +0000 (23:36 +0000)]
Merge "Convert to Android.bp"
am:
99de09fe7f -s ours
Change-Id: I16fbbe0cdeffe80b7b92148f696ec2db848cd4cf
Dan Willemsen [Tue, 18 Oct 2016 23:26:08 +0000 (23:26 +0000)]
Merge "Convert to Android.bp"
Dan Willemsen [Tue, 4 Oct 2016 06:56:51 +0000 (23:56 -0700)]
Convert to Android.bp
See build/soong/README.md for more information.
Test: mmma -j frameworks/native/{libs/gui,opengl/libs}
Change-Id: I90b4e299ebd2a38afb6642bc242d4ad5424fb901
Merged-In: I90b4e299ebd2a38afb6642bc242d4ad5424fb901
Dan Willemsen [Tue, 18 Oct 2016 21:06:50 +0000 (21:06 +0000)]
Convert to Android.bp am:
3106c1c4fc
am:
2d4e12f147
Change-Id: Iaed7fa8aa07d9bbcf3614e6a0ec859d623997dbc
Dan Willemsen [Tue, 18 Oct 2016 20:59:48 +0000 (20:59 +0000)]
Convert to Android.bp
am:
3106c1c4fc
Change-Id: I4e0b4bbe420201473a345ed19eaee753f45a4b80
Dianne Hackborn [Tue, 18 Oct 2016 20:20:44 +0000 (20:20 +0000)]
Merge "Finish implementation of "cmd"."
Dan Willemsen [Tue, 4 Oct 2016 06:56:51 +0000 (23:56 -0700)]
Convert to Android.bp
See build/soong/README.md for more information.
Test: mmma -j frameworks/native/{libs/gui,opengl/libs}
Change-Id: I90b4e299ebd2a38afb6642bc242d4ad5424fb901
Fabien Sanglard [Tue, 18 Oct 2016 19:07:08 +0000 (19:07 +0000)]
Merge "Fix surfaceflinger file descriptor leak" am:
af2fbb0ccc am:
ee87482e6d
am:
735d32406d
Change-Id: Iadc2fdb10b6648e36d304dd22fd1119a3b03d728
Fabien Sanglard [Tue, 18 Oct 2016 18:58:42 +0000 (18:58 +0000)]
Merge "Fix surfaceflinger file descriptor leak" am:
af2fbb0ccc
am:
ee87482e6d
Change-Id: I87f37b1ecc15b0b7800c0269f5a27df59125c73f
Fabien Sanglard [Tue, 18 Oct 2016 18:51:46 +0000 (18:51 +0000)]
Merge "Fix surfaceflinger file descriptor leak"
am:
af2fbb0ccc
Change-Id: If21d062e144dd13064c0c3e8021523a8bf20b864