OSDN Git Service
Nicolas Capens [Fri, 30 Oct 2015 16:55:21 +0000 (12:55 -0400)]
Fix parsing the EGL extension string.
The EGL extension string does not necessarily have a space before the
terminating null. The previous code would skip the last extension name
when there's no extra space. The new code also works for empty strings.
Change-Id: Ib272cf05a7ebcc0de417f91966489ed4db33c283
Pablo Ceballos [Thu, 5 Nov 2015 18:14:08 +0000 (18:14 +0000)]
Merge changes from topic 'single_buffer_mode'
* changes:
SF: Force refresh when in single buffer mode
BQ: Add support for single buffer mode
Casey Dahlin [Thu, 5 Nov 2015 00:19:12 +0000 (00:19 +0000)]
Merge "Add support for reading/writing a vector of binders" am:
fd6843236f am:
4ed5d8c98e
am:
e6788fa5c2
* commit '
e6788fa5c2548db912a098174eb93b784dc8b7dd':
Add support for reading/writing a vector of binders
Casey Dahlin [Thu, 5 Nov 2015 00:17:07 +0000 (00:17 +0000)]
Merge "Add support for reading/writing a vector of binders" am:
fd6843236f
am:
4ed5d8c98e
* commit '
4ed5d8c98ea74c953b767a84ebfedf9d038dba3b':
Add support for reading/writing a vector of binders
Casey Dahlin [Thu, 5 Nov 2015 00:15:12 +0000 (00:15 +0000)]
Merge "Add support for reading/writing a vector of binders"
am:
fd6843236f
* commit '
fd6843236fe9094fc8868f1a58e6ba4364a485a7':
Add support for reading/writing a vector of binders
Casey Dahlin [Thu, 5 Nov 2015 00:12:57 +0000 (00:12 +0000)]
Merge "Add support for reading/writing a vector of binders"
Riley Andrews [Wed, 4 Nov 2015 00:52:35 +0000 (00:52 +0000)]
Merge "Add ipi tracing to irq tracing." am:
c84da67d72 am:
b813f5e2e8
am:
6ea4e35ab1
* commit '
6ea4e35ab1c4fc93b9dc176423e6e425c85bf360':
Add ipi tracing to irq tracing.
Riley Andrews [Wed, 4 Nov 2015 00:47:32 +0000 (00:47 +0000)]
Merge "Add ipi tracing to irq tracing." am:
c84da67d72
am:
b813f5e2e8
* commit '
b813f5e2e8b6a799b14720097bb9e1394e2c5262':
Add ipi tracing to irq tracing.
Riley Andrews [Wed, 4 Nov 2015 00:43:08 +0000 (00:43 +0000)]
Merge "Add ipi tracing to irq tracing."
am:
c84da67d72
* commit '
c84da67d723ce4bafc3622cd269207ea3995ff1c':
Add ipi tracing to irq tracing.
Riley Andrews [Wed, 4 Nov 2015 00:29:45 +0000 (00:29 +0000)]
Merge "Add ipi tracing to irq tracing."
Bill Yi [Tue, 3 Nov 2015 23:47:27 +0000 (23:47 +0000)]
Bill Yi [Tue, 3 Nov 2015 23:33:57 +0000 (23:33 +0000)]
Bill Yi [Tue, 3 Nov 2015 22:30:01 +0000 (14:30 -0800)]
Casey Dahlin [Tue, 3 Nov 2015 21:50:37 +0000 (13:50 -0800)]
Add support for reading/writing a vector of binders
Change-Id: Iaa8da704b2ae3c1ca5456177441a335991b40e8a
Test: unit tests pass
Bug:
24470786
Signed-off-by: Casey Dahlin <sadmac@google.com>
Pablo Ceballos [Wed, 7 Oct 2015 23:32:12 +0000 (16:32 -0700)]
SF: Force refresh when in single buffer mode
- Add a boolean to BufferItem to track whether single buffer mode is
enabled. When it is, force SurfaceFlinger to acquire a new buffer
and refresh on every vsync.
Bug
24940410
Change-Id: Iea67330c416b6fb14500865f98c67f1c12f23197
Pablo Ceballos [Wed, 7 Oct 2015 22:05:45 +0000 (15:05 -0700)]
BQ: Add support for single buffer mode
- Adds a single buffer mode to BufferQueue. In this mode designate the
first dequeued buffer as the shared buffer. All calls to dequeue()
and acquire() will then return the shared buffer, allowing the
producer and consumer to share it.
- Modify the buffer slot state tracking. Add a new SHARED state for
the shared buffer in single buffer mode. Also track how many times
a buffer has been dequeued/queued/acquired as it's possible for a
shared buffer to be both dequeued and acquired at the same time, or
dequeued/acquired multiple times. This tracking is needed to know
when to drop the buffer out of the SHARED state after single buffer
mode has been disabled.
- Add plumbing for enabling/disabling single buffer mode from Surface.
Bug
24940410
Change-Id: I3fc550c74bacb5523c049a227111356257386853
Riley Andrews [Tue, 3 Nov 2015 05:01:34 +0000 (21:01 -0800)]
Add ipi tracing to irq tracing.
Christopher Wiley [Tue, 3 Nov 2015 00:05:01 +0000 (00:05 +0000)]
Merge "Fix bug in byte vector serialization" am:
fe98e8d6e5 am:
28df99d077
am:
3c0a4d288e
* commit '
3c0a4d288eee41b2df2c1f75a0cd8561d8c8cb70':
Fix bug in byte vector serialization
Elliott Hughes [Tue, 3 Nov 2015 00:04:54 +0000 (00:04 +0000)]
Merge "Further reduce duplication in bugreport ps output." am:
670508d09a am:
1fa95dd57b
am:
91ff9d56d5
* commit '
91ff9d56d5991de50b6bda4134121643166727cd':
Further reduce duplication in bugreport ps output.
Christopher Wiley [Tue, 3 Nov 2015 00:00:40 +0000 (00:00 +0000)]
Merge "Fix bug in byte vector serialization" am:
fe98e8d6e5
am:
28df99d077
* commit '
28df99d077e86bd395e0f6235238d283773125cf':
Fix bug in byte vector serialization
Christopher Wiley [Mon, 2 Nov 2015 23:58:23 +0000 (23:58 +0000)]
Merge "Fix bug in byte vector serialization"
am:
fe98e8d6e5
* commit '
fe98e8d6e53ffef172c4571e6c408c4801c3e96c':
Fix bug in byte vector serialization
Christopher Wiley [Mon, 2 Nov 2015 23:53:16 +0000 (23:53 +0000)]
Merge "Fix bug in byte vector serialization"
Elliott Hughes [Mon, 2 Nov 2015 22:48:36 +0000 (22:48 +0000)]
Merge "Further reduce duplication in bugreport ps output." am:
670508d09a
am:
1fa95dd57b
* commit '
1fa95dd57b61735b816e29c74a7613e261ba538d':
Further reduce duplication in bugreport ps output.
Elliott Hughes [Mon, 2 Nov 2015 22:45:36 +0000 (22:45 +0000)]
Merge "Further reduce duplication in bugreport ps output."
am:
670508d09a
* commit '
670508d09acf64fad83d0c7ac90330d3db89c861':
Further reduce duplication in bugreport ps output.
Elliott Hughes [Mon, 2 Nov 2015 22:43:23 +0000 (22:43 +0000)]
Merge "Further reduce duplication in bugreport ps output."
Elliott Hughes [Mon, 2 Nov 2015 22:16:09 +0000 (14:16 -0800)]
Further reduce duplication in bugreport ps output.
PROCESSES and PROCESSES AND THREADS can be combined. There's nothing in
the former that isn't in the latter.
Change-Id: I105a6d8d35488236ef6dbf4107496ea7e5ad70ea
Badhri Jagan Sridharan [Mon, 2 Nov 2015 18:35:08 +0000 (18:35 +0000)]
Merge "batteryservice: Add max charging voltage"
Christopher Wiley [Sat, 31 Oct 2015 20:22:15 +0000 (13:22 -0700)]
Fix bug in byte vector serialization
Byte vectors are used by the generated C++ code as the representation
of Java byte[]. This type is serialized as a packed byte array on
the java side.
Bug:
25012838
Test: integration tests for byte[] show this type crossing language
boundaries correctly.
Change-Id: I8bb1b8ffcb77ced44f99f6b370226a32694f7df1
Elliott Hughes [Fri, 30 Oct 2015 23:52:41 +0000 (23:52 +0000)]
Merge "Reduce duplication in bugreport ps output." am:
8ebad13b34 am:
ed59c4e629
am:
ac6e708560
* commit '
ac6e7085600bcfa222261d578f65d8c08a87c230':
Reduce duplication in bugreport ps output.
Elliott Hughes [Fri, 30 Oct 2015 23:48:37 +0000 (23:48 +0000)]
Merge "Reduce duplication in bugreport ps output." am:
8ebad13b34
am:
ed59c4e629
* commit '
ed59c4e629c0c72871866e75789e0ece829f4823':
Reduce duplication in bugreport ps output.
Elliott Hughes [Fri, 30 Oct 2015 23:44:50 +0000 (23:44 +0000)]
Merge "Reduce duplication in bugreport ps output."
am:
8ebad13b34
* commit '
8ebad13b340921a40a367c9f1808d0c26147e2a6':
Reduce duplication in bugreport ps output.
Elliott Hughes [Fri, 30 Oct 2015 23:39:29 +0000 (23:39 +0000)]
Merge "Reduce duplication in bugreport ps output."
Elliott Hughes [Fri, 30 Oct 2015 23:17:49 +0000 (16:17 -0700)]
Reduce duplication in bugreport ps output.
PROCESSES AND THREADS and PROCESSES (SELINUX LABELS) can be combined.
I suspect we can just remove PROCESSES too, since it's a strict
subset of the other information, but one step at a time. (The worry
is that someone's actually parsing this output, but it would be good
to find out who's doing that as soon as possible so we can work with
them as we transition to a more complete ps implementation.)
Change-Id: I5f1085f8853f7a988f7edcaeefdd7b63175c1473
Haixia Shi [Wed, 28 Oct 2015 23:19:01 +0000 (16:19 -0700)]
SF: more DispSync improvements.
Pass the reference time to DispSyncThread. Since the phase offset is calculated
using timestamps relative to the reference time, we must also adjust the phase
offset by the same reference time when computing the next refresh time.
Always reset phase offset to zero when updating the reference time because the
reference time equals the first timestamp.
After beginResync() we need to keep HW vsync enabled until the model is updated.
Bug:
25113115
Change-Id: I8eae227bee91c24a99bf8e57fbebceb98d29c77d
Test: check in systrace that app/sf vsync events have correct phase
Haixia Shi [Wed, 28 Oct 2015 20:22:22 +0000 (13:22 -0700)]
SF: use first sample timestamp as reference.
Do not use the absolute 64-bit nsecs_t timestamp directly in phase
and error calculations. Compared to the estimated vsync period, the
timestamp tend to many orders of magnitudes larger, and consequently
the integer modulo operation used to calculate phase and error can
be very sensitive to tiny fluctuation in vsync period.
Bug:
25113115
Test: set kTraceDetailedInfo=true; see Phase and Error are stable in systrace
Change-Id: I687703eec31b1072c606898c0424a96c0a8ca033
Pablo Ceballos [Fri, 23 Oct 2015 23:20:19 +0000 (16:20 -0700)]
Finish up the Rect constructor cleanup
Bug
18173359
Change-Id: I36e83ba4e9ce9884533952d8321d22f666cc8a06
Peng Xu [Fri, 30 Oct 2015 04:24:12 +0000 (04:24 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev am:
a78c2e65e1 am:
ffb07f645e am:
e4db21f4b8
am:
cca37b0d39
* commit '
cca37b0d39137ccb5ad6843fffd1ff34b5961f06':
Avoiding flush on-change sensors at subscription
Rob Carr [Thu, 29 Oct 2015 19:22:04 +0000 (19:22 +0000)]
Merge "Support SurfaceView synchronization."
Badhri Jagan Sridharan [Tue, 27 Oct 2015 20:37:05 +0000 (13:37 -0700)]
batteryservice: Add max charging voltage
Bug:
25229483
Change-Id: I4b6dd13870c41907c708f32412261efdca826023
Peng Xu [Thu, 29 Oct 2015 16:54:25 +0000 (16:54 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev am:
a78c2e65e1 am:
ffb07f645e
am:
e4db21f4b8
* commit '
e4db21f4b8bd12000e8052a6d5a6e1b1e4349a5a':
Avoiding flush on-change sensors at subscription
Peng Xu [Thu, 29 Oct 2015 16:46:18 +0000 (16:46 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev am:
a78c2e65e1
am:
ffb07f645e
* commit '
ffb07f645e12b5c32479bba74b3310353edf691a':
Avoiding flush on-change sensors at subscription
Dan Stoza [Fri, 22 May 2015 16:51:44 +0000 (09:51 -0700)]
Support SurfaceView synchronization.
Add API for fetching the next frame number to be produced by
a given buffer producer. Add an API to SurfaceComposer to
defer execution of the current transaction until a given frame number.
Together these may be used to synchronize app drawing and surface
control updates.
Change-Id: I8e0f4993332ac0199c768c88581a453fefbaff1d
Casey Dahlin [Wed, 28 Oct 2015 23:55:10 +0000 (23:55 +0000)]
Merge "Add readStrongBinder that takes an interface" am:
71b70a244c am:
6319281c24
am:
75c5de42b7
* commit '
75c5de42b759bdcfa7c0e6103fb959c28d686116':
Add readStrongBinder that takes an interface
Casey Dahlin [Wed, 28 Oct 2015 23:51:49 +0000 (23:51 +0000)]
Merge "Add readStrongBinder that takes an interface" am:
71b70a244c
am:
6319281c24
* commit '
6319281c24284a83f8bab090c6048d864635f0dd':
Add readStrongBinder that takes an interface
Casey Dahlin [Wed, 28 Oct 2015 23:48:12 +0000 (23:48 +0000)]
Merge "Add readStrongBinder that takes an interface"
am:
71b70a244c
* commit '
71b70a244c56719d30654b7123a944d971eb8d02':
Add readStrongBinder that takes an interface
Casey Dahlin [Wed, 28 Oct 2015 23:41:58 +0000 (23:41 +0000)]
Merge "Add readStrongBinder that takes an interface"
Casey Dahlin [Wed, 28 Oct 2015 01:33:56 +0000 (18:33 -0700)]
Add readStrongBinder that takes an interface
We use a template function to let us pass arbitrary interfaces, all of which
can be cast to IBinder.
Change-Id: Iadf21c495cde43e8a5adb85a49e6592196f401ff
Test: unit tests
Bug:
23600713
Signed-off-by: Casey Dahlin <sadmac@google.com>
Vladislav Kaznacheev [Wed, 28 Oct 2015 20:12:23 +0000 (20:12 +0000)]
Merge "Add XML for FEATURE_FREEFORM_WINDOW_MANAGEMENT"
Christopher Wiley [Wed, 28 Oct 2015 18:28:32 +0000 (18:28 +0000)]
Merge "libbinder: Fix out of bounds in readBoolVector" am:
1f76049c95 am:
87a30d930a
am:
23cd9ff6d8
* commit '
23cd9ff6d80cfb33873728369211e014fd0351a2':
libbinder: Fix out of bounds in readBoolVector
Christopher Wiley [Wed, 28 Oct 2015 18:23:53 +0000 (18:23 +0000)]
Merge "libbinder: Fix out of bounds in readBoolVector" am:
1f76049c95
am:
87a30d930a
* commit '
87a30d930a76a9e73643bbac8737781d72fed33f':
libbinder: Fix out of bounds in readBoolVector
Christopher Wiley [Wed, 28 Oct 2015 18:20:29 +0000 (18:20 +0000)]
Merge "libbinder: Fix out of bounds in readBoolVector"
am:
1f76049c95
* commit '
1f76049c955c605b61ef0d923582c740c325b1a0':
libbinder: Fix out of bounds in readBoolVector
Christopher Wiley [Wed, 28 Oct 2015 18:14:01 +0000 (18:14 +0000)]
Merge "libbinder: Fix out of bounds in readBoolVector"
Christopher Wiley [Tue, 27 Oct 2015 23:33:47 +0000 (16:33 -0700)]
libbinder: Fix out of bounds in readBoolVector
Bug:
25012838
Test: This code now works at runtime.
Change-Id: I3d6b2677f11276e6be4c51451ca36572a4ee573d
Vladislav Kaznacheev [Wed, 28 Oct 2015 00:36:42 +0000 (17:36 -0700)]
Add XML for FEATURE_FREEFORM_WINDOW_MANAGEMENT
Bug:
25329519
Change-Id: I087d5a8573d6b38f10918c0b7a63048273f008b9
Peng Xu [Tue, 27 Oct 2015 22:31:50 +0000 (22:31 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
am:
a78c2e65e1
* commit '
a78c2e65e13cace4fdbb0295beca5b11de9fde06':
Avoiding flush on-change sensors at subscription
Peng Xu [Tue, 27 Oct 2015 22:23:21 +0000 (22:23 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
Peng Xu [Mon, 26 Oct 2015 22:14:43 +0000 (15:14 -0700)]
Avoiding flush on-change sensors at subscription
Initial sensor flush at subscription is a mechanism to avoid sensors
to get stale samples before subscription happens. However, there is a
slight chance that a most recent sample will be lost during the flush
process. This is OK for continuous sensors but problematic in
on-change sensor as on-change event does not come continuously and
a lost event can cause inconsistent state in client. Flush at
subscription of on-change sensor is disabled in this CL to avoid new
important on-change event to be discarded during the initial flush
process.
Bugs: b/
24647069
b/
25241873
b/
24804819
Change-Id: Ibda099c6b9f5fb6e200f13cf13a850b0026e9e7c
Pablo Ceballos [Tue, 27 Oct 2015 17:57:23 +0000 (17:57 +0000)]
Merge "Add missing OpenGLES 3.1 bitfield constants."
Dan Stoza [Mon, 26 Oct 2015 18:12:25 +0000 (18:12 +0000)]
Merge "surfaceflinger: Set max acquired buffer count" am:
af5c3b1d6a am:
e76d32d086
am:
5732481aab -s ours
* commit '
5732481aabbf2fd077756abd1d395c3a6c271ad9':
surfaceflinger: Set max acquired buffer count
Dan Stoza [Mon, 26 Oct 2015 18:05:51 +0000 (18:05 +0000)]
Merge "surfaceflinger: Set max acquired buffer count" am:
af5c3b1d6a
am:
e76d32d086
* commit '
e76d32d08656949399587251e761d7710b058e3a':
surfaceflinger: Set max acquired buffer count
Dan Stoza [Mon, 26 Oct 2015 18:02:31 +0000 (18:02 +0000)]
Merge "surfaceflinger: Set max acquired buffer count"
am:
af5c3b1d6a
* commit '
af5c3b1d6a9cc1d36b526291391009b2a4e097ff':
surfaceflinger: Set max acquired buffer count
Dan Stoza [Mon, 26 Oct 2015 17:58:53 +0000 (17:58 +0000)]
Merge "surfaceflinger: Set max acquired buffer count"
Pablo Ceballos [Mon, 26 Oct 2015 17:33:11 +0000 (17:33 +0000)]
Merge "SF: Connect the VDS scratch surface producer"
Martijn Coenen [Mon, 26 Oct 2015 07:05:43 +0000 (07:05 +0000)]
Merge "Support tracing pagecache stats."
Nick Kralevich [Fri, 23 Oct 2015 21:59:06 +0000 (21:59 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e am:
1d94a1d036 -s ours am:
bce101e79b am:
574145ea31 am:
5ce90247a2 am:
fd84a642ff
am:
354393ef75 -s ours
* commit '
354393ef75cdd25864f4d22ebba0c14163aedae4':
DO NOT MERGE: fix build try #2
Adrian Roos [Fri, 23 Oct 2015 21:59:01 +0000 (21:59 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am:
cf33d50d25 am:
0c11f9918c am:
bcc709b94d
am:
0d2a22ece8
* commit '
0d2a22ece851b5ee358ac18214ccbfa28c3eb121':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Nick Kralevich [Fri, 23 Oct 2015 21:49:23 +0000 (21:49 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e am:
1d94a1d036 -s ours am:
bce101e79b am:
574145ea31 am:
5ce90247a2
am:
fd84a642ff
* commit '
fd84a642ff1e6b30fe5c5adb623cc9e2addbb712':
DO NOT MERGE: fix build try #2
Adrian Roos [Fri, 23 Oct 2015 21:49:18 +0000 (21:49 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am:
cf33d50d25 am:
0c11f9918c
am:
bcc709b94d
* commit '
bcc709b94d72e7f2d03d952dbf8a21b6980fd3a9':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Nick Kralevich [Fri, 23 Oct 2015 21:40:03 +0000 (21:40 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e am:
1d94a1d036 -s ours am:
bce101e79b am:
574145ea31
am:
5ce90247a2
* commit '
5ce90247a20536091505b449a4d386c21034d842':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 21:35:13 +0000 (21:35 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e am:
1d94a1d036 -s ours am:
bce101e79b
am:
574145ea31
* commit '
574145ea31171a80c45f86eb231f55a2106826c4':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 21:22:14 +0000 (21:22 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e am:
1d94a1d036 -s ours
am:
bce101e79b
* commit '
bce101e79b5ee9715a8329db8fd760f7ba829de1':
DO NOT MERGE: fix build try #2
Adrian Roos [Thu, 22 Oct 2015 23:46:12 +0000 (16:46 -0700)]
Maintain Parcel ABI
Makes sure we don't change the memory layout of the Parcel class
to maintain binary compatibility with prebuilts linking against
libbinder.
Bug:
25004154
Change-Id: I656687497f08bb85cefda796aafa2341e601e30a
(cherry picked from commit
6bb3114246f6f6aa406e65452dbaa12b135029ea)
Adrian Roos [Thu, 22 Oct 2015 23:12:53 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit
6880307e8e35a6c484942443fb4ddd6173126152.
Bug:
25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
(cherry picked from commit
cbf3726357966539c2a685f46e61c3fc8937f19e)
Pablo Ceballos [Fri, 23 Oct 2015 19:10:13 +0000 (12:10 -0700)]
SF: Connect the VDS scratch surface producer
- VirtualDisplaySurface has a BufferQueue for producing scratch
buffers when doing mixed composition for a virtual display.
- Connect/disconnect the producer end of this BufferQueue in the
VirtualDisplaySurface constructor/destructor to avoid using it in a
disconnected state.
Bug
24733179
Change-Id: I87dab9ff4f46d422b7796670b0b4d17b7fd09165
Adrian Roos [Fri, 23 Oct 2015 17:32:40 +0000 (17:32 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am:
cf33d50d25
am:
0c11f9918c
* commit '
0c11f9918c6f834f12d97315ef0247c08f8fef63':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Fri, 23 Oct 2015 17:28:42 +0000 (17:28 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev
am:
cf33d50d25
* commit '
cf33d50d25c5660bf1d4325c11433fb281bc31cb':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Fri, 23 Oct 2015 17:21:23 +0000 (17:21 +0000)]
Merge changes from topic 'parcel-v2' into mnc-dr-dev
* changes:
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Martijn Coenen [Fri, 23 Oct 2015 11:57:05 +0000 (13:57 +0200)]
Support tracing pagecache stats.
Change-Id: Iac12fd8d0238db30d1415418d2b4f168fd4195c2
Nick Kralevich [Fri, 23 Oct 2015 04:36:16 +0000 (04:36 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e
am:
1d94a1d036 -s ours
* commit '
1d94a1d036cb4bc8d9b178f56fa3bbddc81b7f10':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 04:32:47 +0000 (04:32 +0000)]
Nick Kralevich [Fri, 23 Oct 2015 04:32:47 +0000 (04:32 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours
am:
a2685ebb1e
* commit '
a2685ebb1ec5ed523fb4800d2593f2ae0c10ed22':
DO NOT MERGE: fix build try #2
Flanker [Fri, 23 Oct 2015 04:32:43 +0000 (04:32 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7 am:
711c7becb0 am:
928a4879e4 am:
cd9aad3a95
am:
ce12ffb017
* commit '
ce12ffb0176f1ed42caf82ad07996c06f556a582':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:30:05 +0000 (04:30 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e am:
0370a03b6e am:
18e7c64ea8 am:
6eac97d4ba
am:
69b8174c5e
* commit '
69b8174c5e184d0a314821d24893e931946ede83':
DO NOT MERGE: fix build breakage
Flanker [Fri, 23 Oct 2015 04:30:01 +0000 (04:30 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7 am:
711c7becb0 am:
928a4879e4
am:
cd9aad3a95
* commit '
cd9aad3a95c1fbb3062abada8cb851a41e79556d':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:26:07 +0000 (04:26 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e am:
0370a03b6e am:
18e7c64ea8
am:
6eac97d4ba
* commit '
6eac97d4baf77954c7d862e7bf35ed3763543491':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours
am:
dbc9a47831 -s ours
* commit '
dbc9a478311e8728c8148a80abb103fca697891d':
DO NOT MERGE: fix build try #2
Flanker [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7 am:
711c7becb0
am:
928a4879e4
* commit '
928a4879e4a2b996bccf007d390f7f2719e9a901':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:23:35 +0000 (04:23 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e am:
0370a03b6e
am:
18e7c64ea8
* commit '
18e7c64ea82e002978ef069884d195e02e7302df':
DO NOT MERGE: fix build breakage
Flanker [Fri, 23 Oct 2015 04:23:24 +0000 (04:23 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7
am:
711c7becb0
* commit '
711c7becb01eec79d8335f335fab6e00a9164b00':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:19:58 +0000 (04:19 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e
am:
0370a03b6e
* commit '
0370a03b6e74e40d5110b83fed2243bf072aee73':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902
am:
034bc1799c -s ours
* commit '
034bc1799cbbc4184aa507eba181573c0a3b9b35':
DO NOT MERGE: fix build try #2
Flanker [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6
am:
a82ace99f7
* commit '
a82ace99f76ed815e16ab64eae2e9e55871a8b8f':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:15:24 +0000 (04:15 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f
am:
1b28b05d2e
* commit '
1b28b05d2edf11f49717b53cd49a9161892f0388':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 04:15:21 +0000 (04:15 +0000)]
DO NOT MERGE: fix build try #2
am:
778b6f4902
* commit '
778b6f4902ad824d5fc62071caaa837bb47deee5':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 02:02:42 +0000 (02:02 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7
am:
9ec978732f
* commit '
9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:52:34 +0000 (01:52 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65
am:
fa632f6ad7
* commit '
fa632f6ad7be6b1f488dd3d1b825a82456db5097':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:44:26 +0000 (01:44 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
am:
7f1ea80d65
* commit '
7f1ea80d65996ab687ff56a884da915535cdc176':
DO NOT MERGE: fix build breakage
Adrian Roos [Thu, 22 Oct 2015 23:46:12 +0000 (16:46 -0700)]
Maintain Parcel ABI
Makes sure we don't change the memory layout of the Parcel class
to maintain binary compatibility with prebuilts linking against
libbinder.
Bug:
25004154
Change-Id: I656687497f08bb85cefda796aafa2341e601e30a
Adrian Roos [Thu, 22 Oct 2015 23:12:53 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit
6880307e8e35a6c484942443fb4ddd6173126152.
Bug:
25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
Nick Kralevich [Fri, 23 Oct 2015 00:26:19 +0000 (17:26 -0700)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
Bug:
23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
OSDN Git Service
