OSDN Git Service
Chia-I Wu [Fri, 22 Jul 2016 02:36:33 +0000 (10:36 +0800)]
libvulkan: Fix for -Wcast-calling-convention
It should be harmless, as NoOp does not use any argument and should never
be reached.
Bug:
30290462
Change-Id: I0592c3ce10c510713525b5aa0bd38a2f9adc5898
Dan Willemsen [Thu, 21 Jul 2016 20:50:00 +0000 (20:50 +0000)]
Merge "Dumpstate: Fix long lines." into stage-aosp-master
Roshan Pius [Thu, 21 Jul 2016 18:28:38 +0000 (18:28 +0000)]
Merge \"Add |readString8| method which returns failure\"
am:
115e6ec7e9
Change-Id: Iaf1ea3b66ed242dcd82a88ebc0556c08a5fdf85e
Roshan Pius [Thu, 21 Jul 2016 18:19:33 +0000 (18:19 +0000)]
Merge "Add |readString8| method which returns failure"
Roshan Pius [Mon, 18 Jul 2016 19:51:02 +0000 (12:51 -0700)]
Add |readString8| method which returns failure
Add a new method to return |String8| read failures from Parcels.
BUG:
30189542
Change-Id: I65b59887dd9a15068abe95d24d390aa577bc49a6
Christopher Ferris [Wed, 20 Jul 2016 18:09:35 +0000 (18:09 +0000)]
Merge \"Change to include linux/android/binder.h.\"
am:
b34400ea94
Change-Id: I1aab76bd51c448410d1d9ff3ae288013c81c8d52
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Change to include linux/android/binder.h."
Christopher Wiley [Wed, 20 Jul 2016 15:28:14 +0000 (08:28 -0700)]
Fix unused variable build errors
Change-Id: Ia4f5dc95110b75eefc41b2828990cdbbcb75c033
Christopher Wiley [Wed, 20 Jul 2016 15:10:31 +0000 (15:10 +0000)]
Merge \"libbinder: Tighten compiler warnings/errors\"
am:
ead989c34d
Change-Id: I8d06de42b9ac861b3189db936656cf906ba3597f
Treehugger Robot [Wed, 20 Jul 2016 15:04:31 +0000 (15:04 +0000)]
Merge "libbinder: Tighten compiler warnings/errors"
Pirama Arumuga Nainar [Tue, 28 Jun 2016 21:45:29 +0000 (14:45 -0700)]
Disable -Wcast-calling-convention for vulkan
The following warning is triggered by the upcoming Clang update to
r271374:
frameworks/native/vulkan/libvulkan/stubhal.cpp:114:12: error: cast
between incompatible calling conventions 'cdecl' and 'aapcs-vfp'; calls
through thispointer may abort at runtime
[-Werror,-Wcast-calling-convention]
return reinterpret_cast<PFN_vkVoidFunction>(NoOp);
Change-Id: I8de75fd6a3b579a91598aebbdd23bf74b57c3593
(cherry picked from commit
b4c0eb1d203f88f0ef9ef9c360c03bcbb3e90efc)
Andreas Gampe [Tue, 19 Jul 2016 01:24:05 +0000 (18:24 -0700)]
Dumpstate: Fix long lines.
Follow-up to commit
aff684300a3b7d6984d3b3c1efddb810cd0205e7.
Change-Id: I3faa645b0da7ea27ce3a8df2dbd3b6a50bc1c2bd
(cherry picked from commit
27cd7b256eb08bf9dec7e4e8af8375711ab10225)
Andreas Gampe [Tue, 19 Jul 2016 01:01:27 +0000 (18:01 -0700)]
Dumpstate: Use unique_fd
ScopedFd has been deprecated (and removed) in favor of unique_fd.
Bug:
21192156
Change-Id: Ic46ca6d349bf0cc640b7d4008ac540d2c6d08568
(cherry picked from commit
aff684300a3b7d6984d3b3c1efddb810cd0205e7)
Christopher Wiley [Tue, 19 Jul 2016 18:19:00 +0000 (18:19 +0000)]
Merge \"Fix broken readNullableStrongBinder<T> implementation\"
am:
6e81c9a4c6
Change-Id: I4342a65c92cbc70f716b21c730f355da3f98dbbb
Treehugger Robot [Tue, 19 Jul 2016 18:06:37 +0000 (18:06 +0000)]
Merge "Fix broken readNullableStrongBinder<T> implementation"
Christopher Wiley [Tue, 19 Jul 2016 16:40:13 +0000 (09:40 -0700)]
libbinder: Tighten compiler warnings/errors
Use all of -Wall -Wextra -Werror and fix the minor errors that result.
Change-Id: Id56e9c454dd3570f713d161577eed6aa8e8074aa
Christopher Wiley [Tue, 19 Jul 2016 16:23:25 +0000 (09:23 -0700)]
Fix broken readNullableStrongBinder<T> implementation
Added a missing return statement. Omitting this statement
caused the compiler to silently cast a pointer to a status_t,
which in general wasn't the expected value of OK.
Only return an error when the type casted return value is null and
the IBinder we got back was not null, indicating a type error, rather
than the expected null binder.
Bug:
30160959
Change-Id: Ief3c924b902a607335eff2fcd4d860cd8523593a
Test: Integration tests in aidl that exercise this method now pass.
Christopher Ferris [Mon, 18 Jul 2016 23:57:34 +0000 (16:57 -0700)]
Change to include linux/android/binder.h.
The upstream kernels have binder.h as linux/android/binder.h, so
match that.
Bug:
30072483
Change-Id: Iacdc96629dd09c1f4be0a5767666ab64b3df8f15
Evgenii Stepanov [Thu, 14 Jul 2016 21:50:29 +0000 (21:50 +0000)]
Merge \"Workaround alloc-dealloc-mismatch error on ASan device boot.\"
am:
7d8f246415
Change-Id: Ic34e6263619b98739f935e0aa05bf50aa7399829
Evgenii Stepanov [Thu, 14 Jul 2016 21:39:39 +0000 (21:39 +0000)]
Merge "Workaround alloc-dealloc-mismatch error on ASan device boot."
Evgenii Stepanov [Thu, 14 Jul 2016 21:17:24 +0000 (14:17 -0700)]
Workaround alloc-dealloc-mismatch error on ASan device boot.
/proc/self/environ inaccessible in SurfaceFlinger
=> ASan fails to read ASAN_OPTIONS => alloc-dealloc-mismatch bug is not
suppressed and prevents the device from booting.
This is not perfect because, by enabling it in asan build only, the first several attempts to start
surfaceflinger fail while the /data partition is being encrypted. On the other hand, this does not affect
user builds, and device eventually gets up anyway.
BUG=b/
30067360
Change-Id: Ieaa37ff7768a11450ea33fee1f7d70a41b246c6a
Lazar Trsic [Wed, 13 Jul 2016 18:39:54 +0000 (18:39 +0000)]
Merge \"[mips] Resolve issue with .align directive, when using clang IAS\"
am:
febb7ea6a0
Change-Id: I38969dbcd1251355cf3b7bbbf2e25a20930c28df
Treehugger Robot [Wed, 13 Jul 2016 18:34:54 +0000 (18:34 +0000)]
Merge "[mips] Resolve issue with .align directive, when using clang IAS"
Lazar Trsic [Wed, 13 Jul 2016 12:53:07 +0000 (14:53 +0200)]
[mips] Resolve issue with .align directive, when using clang IAS
Clang IAS does not support .align without args, concrete value is needed.
Change-Id: I03a9daca0be380daa744307b3510446f8d6c9b7e
Chih-Hung Hsieh [Thu, 7 Jul 2016 22:01:18 +0000 (22:01 +0000)]
Merge \"Fix misc-macro-parentheses warnings in opengl.\"
am:
d4ffb636d8
Change-Id: I93f0fca53e380f0272ef10c4d38ea0033cef7cc4
Chih-hung Hsieh [Thu, 7 Jul 2016 21:55:37 +0000 (21:55 +0000)]
Merge "Fix misc-macro-parentheses warnings in opengl."
Chih-Hung Hsieh [Wed, 29 Jun 2016 21:25:19 +0000 (14:25 -0700)]
Fix misc-macro-parentheses warnings in opengl.
Add parentheses around negative literals.
Bug:
28705665
Test: build with clang-tidy
Change-Id: I342f1d04ac08bbc28ee3ff4ebbbccbfa9f754a94
Mark Salyzyn [Fri, 24 Jun 2016 23:31:24 +0000 (23:31 +0000)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
am:
ced6078b0e
Change-Id: I5972646a22b4a853d5e711d5574c6776a781a5bd
Mark Salyzyn [Fri, 24 Jun 2016 21:37:00 +0000 (21:37 +0000)]
Merge \\"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\\" am:
00e3f2995f
am:
db290501a5
Change-Id: Ib628ab8c43db208fa891d1e19f483a1f6bea21e0
Mark Salyzyn [Fri, 24 Jun 2016 21:35:07 +0000 (21:35 +0000)]
Merge \"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\"
am:
00e3f2995f
Change-Id: Ie0eed7a01655af927304b148005e9a37f9c11883
Mark Salyzyn [Fri, 24 Jun 2016 21:06:15 +0000 (14:06 -0700)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
(cherry pick from commit
7d0a762ecaf9f4d005f0f6db913034c2e084d362)
Bug:
29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50
Mark Salyzyn [Fri, 24 Jun 2016 21:26:16 +0000 (21:26 +0000)]
Merge "dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG"
Mark Salyzyn [Fri, 24 Jun 2016 21:06:15 +0000 (14:06 -0700)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
Bug:
29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50
Greg Kaiser [Thu, 23 Jun 2016 03:31:57 +0000 (03:31 +0000)]
Merge \"Sensor: Make getId() more varied\" into nyc-dev
am:
c0ca0ceaa5
Change-Id: Ifa6208fea63d830d07447d5232b39f9e3ccf870b
Greg Kaiser [Thu, 23 Jun 2016 03:25:44 +0000 (03:25 +0000)]
Merge "Sensor: Make getId() more varied" into nyc-dev
Greg Kaiser [Tue, 21 Jun 2016 23:11:14 +0000 (16:11 -0700)]
Sensor: Make getId() more varied
Apps from different developers will now receive a different
ID for the same dynamic sensor. Additionally, all apps
will now receive a different/new ID for the same dynamic
sensor after a factory reset.
Bug:
28775590,
29547335
Change-Id: I368655b0e4bdc16736a7fd163ea3f7dad2886b3b
Felipe Leme [Wed, 22 Jun 2016 20:29:24 +0000 (20:29 +0000)]
Merge \"Run iptables as root.\" into nyc-dev
am:
ab69cc1f11
Change-Id: I1c45a731c685ddbde7630c588fb6e53a08489a75
TreeHugger Robot [Wed, 22 Jun 2016 20:24:53 +0000 (20:24 +0000)]
Merge "Run iptables as root." into nyc-dev
Greg Kaiser [Mon, 20 Jun 2016 17:21:41 +0000 (17:21 +0000)]
Merge \"SensorList: Don\'t output UUIDs\" into nyc-dev
am:
a0c08e2f8f
Change-Id: Ia791bb67a2351f68da06e0ddc35c224677e4cead
Felipe Leme [Sat, 18 Jun 2016 00:37:13 +0000 (17:37 -0700)]
Run iptables as root.
iptables requires root access and su is not available on user builds,
hence it must be ran before dropping uid to shell user.
BUG:
29455997
Change-Id: I10c6337b411875b061ae9556b6e9c44f83301ae1
Greg Kaiser [Mon, 20 Jun 2016 16:24:51 +0000 (16:24 +0000)]
Merge "SensorList: Don't output UUIDs" into nyc-dev
Eino-Ville Talvala [Sat, 18 Jun 2016 02:18:21 +0000 (02:18 +0000)]
Merge \"BufferQueueProducer: Signal consumer when a buffer is detached\" into nyc-dev
am:
51ed38bb13
Change-Id: I9adb021022e1ed4b1a5b74eaa59cc88c5de475a6
Eino-Ville Talvala [Sat, 18 Jun 2016 02:10:11 +0000 (02:10 +0000)]
Merge "BufferQueueProducer: Signal consumer when a buffer is detached" into nyc-dev
Greg Kaiser [Fri, 17 Jun 2016 22:27:12 +0000 (15:27 -0700)]
SensorList: Don't output UUIDs
We don't want the UUIDs of dynamic sensors to be in the logs.
Bug:
28775590
Change-Id: I85ca83e0ad1a0a8ed6618999bd22d86d7ef972f9
Jesse Hall [Fri, 17 Jun 2016 21:05:17 +0000 (21:05 +0000)]
vulkan: Updated IHV documentation
am:
c2f184d9d8
Change-Id: I61d568218cedd32e7deb514fd092d7d424f26218
Jesse Hall [Fri, 17 Jun 2016 20:54:53 +0000 (13:54 -0700)]
vulkan: Updated IHV documentation
Also deleted DevelopersGuide.pdf, which was very out of date and has
been superceded by public documentation on developer.android.com.
Change-Id: I7e47177191a773eea6db3ee2af0a287877cb8532
David Brazdil [Thu, 16 Jun 2016 13:24:01 +0000 (13:24 +0000)]
Merge \"Revert \"Attach profiles to bug reports\"\" into nyc-dev
am:
ea1aa91a25
Change-Id: I736c406da5b866b712c02315a787019ad307c109
David Brazdil [Thu, 16 Jun 2016 13:11:05 +0000 (13:11 +0000)]
Merge "Revert "Attach profiles to bug reports"" into nyc-dev
David Brazdil [Thu, 16 Jun 2016 09:11:31 +0000 (09:11 +0000)]
Revert "Attach profiles to bug reports"
This reverts commit
0faf2b870f934c1cdd883d29642fd84da3b352e2.
Bug:
28610953
Bug:
29395357
Change-Id: I609fe344dfc61311e37b91b48480d9392764a598
Elliott Hughes [Wed, 15 Jun 2016 16:37:43 +0000 (16:37 +0000)]
Merge \\"No need for dumpstate to explicitly reference \\'toybox\\'...\\" am:
c1c06a7d6b
am:
b660711d76
Change-Id: I09b62f9faa6c72e804a9c3199b518cd3c5edb676
Elliott Hughes [Wed, 15 Jun 2016 16:33:42 +0000 (16:33 +0000)]
Merge \"No need for dumpstate to explicitly reference \'toybox\'...\"
am:
c1c06a7d6b
Change-Id: Icb2f2ba9cd42e7f3c209d2f7b9e14ec8443a9a16
Treehugger Robot [Wed, 15 Jun 2016 16:29:53 +0000 (16:29 +0000)]
Merge "No need for dumpstate to explicitly reference 'toybox'..."
Elliott Hughes [Tue, 14 Jun 2016 20:56:00 +0000 (13:56 -0700)]
No need for dumpstate to explicitly reference 'toybox'...
...now we've switched the symlinks over to the toybox implementations.
Change-Id: I6301e3bc8de7210bf111889ee3b014802aecf15c
Craig Donner [Tue, 14 Jun 2016 03:55:26 +0000 (03:55 +0000)]
Merge "resolve merge conflicts of
4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-dev-plus-aosp
Elliott Hughes [Tue, 14 Jun 2016 01:38:37 +0000 (01:38 +0000)]
Merge \\"Move dumpstate over to toybox top.\\" am:
f5e4ac0338
am:
0498cc9683
Change-Id: Ie747d812296798d74d61bba4f9092ba0585b415d
Elliott Hughes [Tue, 14 Jun 2016 01:33:47 +0000 (01:33 +0000)]
Merge \"Move dumpstate over to toybox top.\"
am:
f5e4ac0338
Change-Id: Ib6fb7d2c0b7f5507b02dcd160cb0a24ab8ac1558
Treehugger Robot [Tue, 14 Jun 2016 01:29:49 +0000 (01:29 +0000)]
Merge "Move dumpstate over to toybox top."
Craig Donner [Tue, 14 Jun 2016 00:45:06 +0000 (17:45 -0700)]
resolve merge conflicts of
4931fb2 to nyc-mr1-dev-plus-aosp
Change-Id: Ic490104e9b7f01df5ea6404b3b5bab733fa46812
Elliott Hughes [Tue, 14 Jun 2016 00:35:07 +0000 (17:35 -0700)]
Move dumpstate over to toybox top.
Change-Id: I3715b0d217aaf263687d6cab24ca470caf7c70a0
Craig Donner [Mon, 13 Jun 2016 23:13:02 +0000 (23:13 +0000)]
Merge "Revert "GLConsumer: add build-time disable of gpu protected content"" into nyc-dev
Craig Donner [Mon, 13 Jun 2016 22:14:15 +0000 (22:14 +0000)]
Revert "GLConsumer: add build-time disable of gpu protected content"
This reverts commit
dea97b7aa2b5cfbb7d42f30bcbf86a01778b609b.
Bug:
28545166
Change-Id: I4b069e14c2b99e190ebdea6df1ed83827ffe17b6
John Eckerdal [Mon, 13 Jun 2016 18:44:38 +0000 (18:44 +0000)]
Merge \"Fixed file descriptor leak in IMemory\" into nyc-dev
am:
a13a22649b
Change-Id: I8ab67bafd9c9031924cfb7cf3b2c07a7dce45795
Pablo Ceballos [Mon, 13 Jun 2016 18:44:34 +0000 (18:44 +0000)]
Add FrameStats default constructor am:
9a8c42a72b am:
8cd7d257de am:
67105cc24d am:
b990d75315 am:
a1952f0a6d am:
81d678cf18 am:
ed968dc61c am:
d1d1d4e922
am:
324b700b4b
Change-Id: I751236776c28d33cdb45d6ad4efe8a653e044fa5
Amith Yamasani [Mon, 13 Jun 2016 18:37:40 +0000 (18:37 +0000)]
Merge "Fixed file descriptor leak in IMemory" into nyc-dev
Pablo Ceballos [Mon, 13 Jun 2016 18:26:04 +0000 (18:26 +0000)]
Add FrameStats default constructor am:
9a8c42a72b am:
8cd7d257de am:
67105cc24d am:
b990d75315 am:
a1952f0a6d am:
81d678cf18 am:
ed968dc61c
am:
d1d1d4e922
Change-Id: I581c4df5e3866e8a2326830e6b9e6ca2ffb3bf1c
Pablo Ceballos [Mon, 13 Jun 2016 18:22:14 +0000 (18:22 +0000)]
Add FrameStats default constructor am:
9a8c42a72b am:
8cd7d257de am:
67105cc24d am:
b990d75315 am:
a1952f0a6d am:
81d678cf18
am:
ed968dc61c
Change-Id: Id30d35b89c46fda89990bed6acf932240bdb6890
Pablo Ceballos [Mon, 13 Jun 2016 18:18:09 +0000 (18:18 +0000)]
Add FrameStats default constructor am:
9a8c42a72b am:
8cd7d257de am:
67105cc24d am:
b990d75315 am:
a1952f0a6d
am:
81d678cf18
Change-Id: I24f1e2594fdbd2022a534332009cad9564becd54
Pablo Ceballos [Mon, 13 Jun 2016 18:13:16 +0000 (18:13 +0000)]
Add FrameStats default constructor am:
9a8c42a72b am:
8cd7d257de am:
67105cc24d am:
b990d75315
am:
a1952f0a6d
Change-Id: Icc23cc2a483b13c6ac2134008d553574fffe06f4
Pablo Ceballos [Mon, 13 Jun 2016 18:09:20 +0000 (18:09 +0000)]
Add FrameStats default constructor am:
9a8c42a72b am:
8cd7d257de am:
67105cc24d
am:
b990d75315
Change-Id: Ibc0caec8dc613a6701791f1a633f3793522615af
Pablo Ceballos [Mon, 13 Jun 2016 18:04:17 +0000 (18:04 +0000)]
Add FrameStats default constructor am:
9a8c42a72b am:
8cd7d257de
am:
67105cc24d
Change-Id: Icf85c944e561763b0a9c353f84d614a992168c20
Pablo Ceballos [Mon, 13 Jun 2016 18:00:25 +0000 (18:00 +0000)]
Add FrameStats default constructor am:
9a8c42a72b
am:
8cd7d257de
Change-Id: Ic0df6b15e28ac2acda566fa7f30c9460d36f2a00
Pablo Ceballos [Mon, 13 Jun 2016 17:56:06 +0000 (17:56 +0000)]
Add FrameStats default constructor
am:
9a8c42a72b
Change-Id: Ib78d68c71438391711ea3b91102408d5ad0b966b
Craig Donner [Mon, 13 Jun 2016 16:49:25 +0000 (16:49 +0000)]
Merge \"Fix assignment of 565 format when creating native client buffers.\" into nyc-dev
am:
518e336d3f
Change-Id: Ib6d83268fed9c3bbd6e4819cb89c5381f0d3d0f8
Craig Donner [Mon, 13 Jun 2016 16:36:51 +0000 (16:36 +0000)]
Merge "Fix assignment of 565 format when creating native client buffers." into nyc-dev
Craig Donner [Sat, 11 Jun 2016 00:20:15 +0000 (17:20 -0700)]
Fix assignment of 565 format when creating native client buffers.
Change-Id: Ia379f469a6e18e1f31748dc97aa596d03e507f84
Fixes:
29279664
Felipe Leme [Sat, 11 Jun 2016 00:12:34 +0000 (00:12 +0000)]
Fixed -t order (should be *after* dumpsys :-)
am:
3f83dbe2e0
Change-Id: Ia1d5d06884a35a8a586e0620ee75c54181e6b945
Felipe Leme [Fri, 10 Jun 2016 23:56:33 +0000 (16:56 -0700)]
Fixed -t order (should be *after* dumpsys :-)
BUG:
29042642
Change-Id: I1b88634b0152f849a57f8e82adc82bdc5e609db7
Eino-Ville Talvala [Fri, 10 Jun 2016 21:21:02 +0000 (14:21 -0700)]
BufferQueueProducer: Signal consumer when a buffer is detached
When a buffer is detached, it should be cleared from the consumer-side
cache as well.
Not doing so can leak buffers no longer owned by the queue for extended
lengths of time, depending on the exact usage patterns of the producer
and consumer.
Bug:
28695173
Change-Id: I2c618be51f2c827d92d0e19b92a2d5befda87c38
Felipe Leme [Fri, 10 Jun 2016 20:58:08 +0000 (20:58 +0000)]
Merge \"Set version to 1.0\" into nyc-dev
am:
6ab3c01d18
Change-Id: I8b950e7b4395272e57b2a62af40854ad76ff71ae
TreeHugger Robot [Fri, 10 Jun 2016 20:40:20 +0000 (20:40 +0000)]
Merge "Set version to 1.0" into nyc-dev
Calvin On [Fri, 10 Jun 2016 00:26:47 +0000 (00:26 +0000)]
Merge \"Expose more useful functions that can be used by dumpstate_board().\" into nyc-dev
am:
f678562fa4
Change-Id: Iafc8e259139f11a21ce3104df52fe6a74366bcfa
Felipe Leme [Fri, 10 Jun 2016 00:19:18 +0000 (00:19 +0000)]
Merge "Expose more useful functions that can be used by dumpstate_board()." into nyc-dev
John Eckerdal [Thu, 21 Apr 2016 13:04:14 +0000 (15:04 +0200)]
Fixed file descriptor leak in IMemory
Include dup in critical section to avoid multiple dup calls from
different threads.
The leak happens more frequently since patch in frameworks/av -
6773d4777f4ccbbe6377e4ae1b42c117066ae6ba when recording video since it
will access IMemory from CameraUtils::isNativeHandleMetadata
Bug:
28924660
Author: Henrik Antonsson <henrik.antonsson@sonymobile.com>
Change-Id: I769a914c3adc505b522659a0c43719fb2922e6fd
Dan Austin [Fri, 3 Jun 2016 23:15:54 +0000 (16:15 -0700)]
fixing const/non-const issues in preparation for libcxx rebase
Change-Id: I8528edd3af4a801f29c17f1f54c44be1a1a0b563
Dan Austin [Tue, 31 May 2016 20:27:03 +0000 (13:27 -0700)]
Address const/non-const issues in preparation for libcxx rebase
Change-Id: I7ab9f65b41cbd2a8272810427529f46c6fbf2a0d
(cherry picked from commit
09a7987fb59ed6843d51acf0161d66ed3eb2252f)
(cherry picked from commit
d1a8fe69ec033b59b56c171ac5fa9d90b886a8c5)
Felipe Leme [Wed, 8 Jun 2016 23:41:17 +0000 (23:41 +0000)]
Merge \"Improved error handling.\" into nyc-dev
am:
bbd27419ac
Change-Id: I1cdfd89997adee7d68191b66bab9e437a8be7800
TreeHugger Robot [Wed, 8 Jun 2016 23:35:11 +0000 (23:35 +0000)]
Merge "Improved error handling." into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 18:11:01 +0000 (11:11 -0700)]
Improved error handling.
adb bugreport now properly handles stderr.
BUG:
29161586
Change-Id: I7a59d1feadda3d160eae6fe447a7a3c7e0843cbb
Felipe Leme [Wed, 8 Jun 2016 18:25:36 +0000 (18:25 +0000)]
Merge \"Explicitly sets dumpsys timeout.\" into nyc-dev
am:
12af7d51a1
Change-Id: I1cdc06fdb732e893ea4829a780efe2a931c74598
TreeHugger Robot [Wed, 8 Jun 2016 18:14:00 +0000 (18:14 +0000)]
Merge "Explicitly sets dumpsys timeout." into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 16:51:29 +0000 (09:51 -0700)]
Explicitly sets dumpsys timeout.
The run_command() function takes a timeout as argument, and dumpsys can
also optionally takes a timeout with the -t argument, hence it makes
sense to pass the same value for both (otherwise dumpsys will timeout in
10s).
BUG:
29042642
Change-Id: Ib6e987d94e966686bab71223d7f910af9e549814
David Brazdil [Wed, 8 Jun 2016 15:47:03 +0000 (15:47 +0000)]
Merge \"Attach profiles to bug reports\" into nyc-dev
am:
6d98bac4ab
Change-Id: I30cb48eb317312e153c8936989e43e3acb3c0e14
David Brazdil [Wed, 8 Jun 2016 15:36:45 +0000 (15:36 +0000)]
Merge "Attach profiles to bug reports" into nyc-dev
David Brazdil [Fri, 3 Jun 2016 13:40:44 +0000 (14:40 +0100)]
Attach profiles to bug reports
Includes the entire '/data/misc/profiles' folder in the bug report
ZIP file if not user build.
Bug:
28610953
Change-Id: I99d46f024e5557cf94e6045a51c46a605a00c52b
Robert Carr [Tue, 7 Jun 2016 20:47:01 +0000 (20:47 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
am:
c3da482bb8
* commit '
c3da482bb8081ee2c19b5965585267b8e21cfc7e':
SurfaceFlinger: Add mode to apply position with resize.
Change-Id: Ic185f162bdb765dfdd19ce35f3dd94e29bb8dea3
TreeHugger Robot [Tue, 7 Jun 2016 20:42:03 +0000 (20:42 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
Janis Danisevskis [Tue, 7 Jun 2016 19:28:25 +0000 (19:28 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
am:
0950fb3d20
* commit '
0950fb3d20d100f62961db1cc3eff51b51f9ca6b':
Fix Parcelable::readParcelableVector<T>
Change-Id: I4fd443663515eec05d992bf42263fea7d9bdc7c4
Janis Danisevskis [Tue, 7 Jun 2016 19:23:45 +0000 (19:23 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
Robert Carr [Sun, 15 May 2016 18:27:47 +0000 (11:27 -0700)]
SurfaceFlinger: Add mode to apply position with resize.
For some cases, like scaled windows with shadows,
we need to be able to apply the position concurrent with
window resize. This is because the scaling of the shadows causes
the top left coordinate of the non shadow surface content
to change before and after the resize.
Bug:
28899837
Change-Id: I522eacfbbcd79707dc1e5ab71901a263b3004ba9
Calvin On [Fri, 3 Jun 2016 22:17:07 +0000 (15:17 -0700)]
Expose more useful functions that can be used by dumpstate_board().
BUG:
28640932
Fixes:
28867848
Change-Id: I38123e5b348f4560212559176eb60dbad4f22364
OSDN Git Service
