OSDN Git Service
Bart Sears [Sat, 5 Dec 2015 03:42:14 +0000 (03:42 +0000)]
Merge "Revert "libbinder: Don\'t redefine B_PACK_CHARS""
am:
3f46d82d7b
* commit '
3f46d82d7b8ee0ae6295723311e5c986b649d727':
Revert "libbinder: Don't redefine B_PACK_CHARS"
Bart Sears [Sat, 5 Dec 2015 03:38:59 +0000 (03:38 +0000)]
Merge "Revert "libbinder: Don't redefine B_PACK_CHARS""
Bart Sears [Sat, 5 Dec 2015 03:38:34 +0000 (03:38 +0000)]
Revert "libbinder: Don't redefine B_PACK_CHARS"
This reverts commit
3eab1b40acbcc2e82b3e90da26706129019eccf9.
Change-Id: Iedc99961c6014029722f814e621970c1732f9092
Elliott Hughes [Sat, 5 Dec 2015 01:39:36 +0000 (17:39 -0800)]
Merge "Track rename from base/ to android-base/."
am:
f31cf3ab0f
* commit '
f31cf3ab0f53394200c0f22a4591db741ba1ccb0':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 01:33:52 +0000 (01:33 +0000)]
Merge "Track rename from base/ to android-base/."
Christopher Wiley [Sat, 5 Dec 2015 00:20:15 +0000 (16:20 -0800)]
Merge "libbinder: Don\'t redefine B_PACK_CHARS"
am:
7166e7823c
* commit '
7166e7823cedb817f0278f569940aa86f424aa3b':
libbinder: Don't redefine B_PACK_CHARS
Christopher Wiley [Sat, 5 Dec 2015 00:15:12 +0000 (00:15 +0000)]
Merge "libbinder: Don't redefine B_PACK_CHARS"
Christopher Wiley [Fri, 4 Dec 2015 22:15:27 +0000 (14:15 -0800)]
libbinder: Don't redefine B_PACK_CHARS
This macro is defined in linux/binder.h which is *sometimes* included
before binder/IBinder.h depending on codepath.
Bug:
25868260
Test: Compiles
Change-Id: Ied1e6658936668c16cbdacab3a3205107c907655
Elliott Hughes [Fri, 4 Dec 2015 23:39:32 +0000 (15:39 -0800)]
Track rename from base/ to android-base/.
Change-Id: I62c18891ffe319d20ff084f5ca2aa0c038c23cd3
Christopher Wiley [Thu, 3 Dec 2015 21:21:21 +0000 (21:21 +0000)]
Merge "libbinder: Handle transaction failures correctly"
am:
823fa55aec
* commit '
823fa55aec55684605e6f4c764ec20901066553c':
libbinder: Handle transaction failures correctly
Christopher Wiley [Thu, 3 Dec 2015 21:17:42 +0000 (21:17 +0000)]
Merge "libbinder: Handle transaction failures correctly"
Christopher Wiley [Mon, 23 Nov 2015 00:29:58 +0000 (16:29 -0800)]
libbinder: Handle transaction failures correctly
Java code expects status_t != OK to be caught at the JNI level in
android_util_Binder.cpp (see signalExceptionForError). We were
incorrectly mapping this kind of failure to a special exception type
and writing that exception type to parcels.
Instead, refuse to write EX_TRANSACTION_FAILED to a parcel and return
the status value instead.
While here, remove non-trivial constructors to push authors toward the
more explicit factory methods. Remove getException() and push authors
toward using the simpler getter methods. Fix minor camelCase issues.
Bug:
25615695
Test: system/tools/aidl integration tests still pass
Change-Id: I7cad3ac8ae8300b5ac0b466606f4934d01e503c5
Dan Stoza [Wed, 2 Dec 2015 18:34:06 +0000 (18:34 +0000)]
Merge "bug#460672 framebuffer surface can\'t keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3"
am:
b2e3095a60
* commit '
b2e3095a604e16d5d80d1e3d38bb92a6c37bd127':
bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
Dan Stoza [Wed, 2 Dec 2015 18:27:05 +0000 (18:27 +0000)]
Merge "bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3"
james.zhang [Tue, 1 Dec 2015 09:55:11 +0000 (17:55 +0800)]
bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
[root cause ] framebuffer surface is in the same process of surface flinger
[changes ] call IGraphicBufferProducer::allocateBuffers on producer inside the DisplayDevice constructor to force-allocate all three buffers.
[side effects] none
[self test ]<tshark, enter and exit mainmenu>: ok
[reviewers ] zhongjun.chen
[change_type ] AOB --> google_original
[tag_product ] common
Change-Id: Ideb75d3aa1ed23b2fa4d263a120ea3ca39d01361
Martijn Coenen [Mon, 30 Nov 2015 18:55:48 +0000 (18:55 +0000)]
Merge "Atrace: support streaming data to stdout."
am:
83a98b101c
* commit '
83a98b101c2850a936c0e612e4eb16d815db025e':
Atrace: support streaming data to stdout.
Martijn Coenen [Mon, 30 Nov 2015 18:51:11 +0000 (18:51 +0000)]
Merge "Atrace: support streaming data to stdout."
Martijn Coenen [Thu, 26 Nov 2015 09:00:55 +0000 (10:00 +0100)]
Atrace: support streaming data to stdout.
Change-Id: I8534a9c69f25ecdd82230a5d8b4b8d1c4d58439e
Casey Dahlin [Mon, 23 Nov 2015 22:33:15 +0000 (22:33 +0000)]
Merge "Add support for file descriptors and vectors thereof"
am:
8f237272e0
* commit '
8f237272e0630b8f279db7f90aebfff73a1a9c00':
Add support for file descriptors and vectors thereof
Casey Dahlin [Mon, 23 Nov 2015 22:22:45 +0000 (22:22 +0000)]
Merge "Add support for file descriptors and vectors thereof"
Casey Dahlin [Mon, 23 Nov 2015 21:24:23 +0000 (13:24 -0800)]
Add support for file descriptors and vectors thereof
We use ScopedFd from nativehelper to manage the lifetime.
Test: Passes AIDL unit and integration tests. Full build completes and
runs.
Bug:
25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
Change-Id: I22c87ed1cb3bd4bf667b372ea4a2e9fcd4dd986a
Christopher Wiley [Mon, 23 Nov 2015 18:19:16 +0000 (18:19 +0000)]
Merge "libbinder: Add support for C++ Parcelable"
am:
49b5443a49
* commit '
49b5443a49d737d13c8d05dfd9b827b2c4198edc':
libbinder: Add support for C++ Parcelable
Christopher Wiley [Mon, 23 Nov 2015 18:14:26 +0000 (18:14 +0000)]
Merge "libbinder: Add support for C++ Parcelable"
Christopher Wiley [Fri, 20 Nov 2015 22:29:38 +0000 (22:29 +0000)]
Merge "libbinder: Move vector writing templates to header"
am:
e1aa1c7e13
* commit '
e1aa1c7e136e7372c17b8db7a6d8b307ba4cd571':
libbinder: Move vector writing templates to header
Christopher Wiley [Fri, 20 Nov 2015 22:25:48 +0000 (22:25 +0000)]
Merge "libbinder: Move vector writing templates to header"
Riley Andrews [Thu, 19 Nov 2015 22:06:48 +0000 (22:06 +0000)]
Merge "Add support for new sched kernel tracepoint"
am:
61c9506a09
* commit '
61c9506a09959ae07832cc019818f869403d3f2a':
Add support for new sched kernel tracepoint
Riley Andrews [Thu, 19 Nov 2015 22:05:29 +0000 (22:05 +0000)]
Merge "Add support for new sched kernel tracepoint"
Riley Andrews [Thu, 19 Nov 2015 21:31:17 +0000 (13:31 -0800)]
Add support for new sched kernel tracepoint
This tracepoint gives systrace the means to display the reason
for uninterruptible sleep.
Christopher Wiley [Thu, 19 Nov 2015 14:49:05 +0000 (06:49 -0800)]
libbinder: Add support for C++ Parcelable
Bug:
23600712
Test: compiles, integration tests for Java/C++ compatibility pass
Change-Id: I0919571919a3633350169ed5668bbb000da9691c
Christopher Wiley [Thu, 19 Nov 2015 14:42:40 +0000 (06:42 -0800)]
libbinder: Move vector writing templates to header
This allows us to reuse them to read and write vectors of parcelables.
Bug:
23600712
Test: Compiles, aidl integration tests pass
Change-Id: Ibbfc2f158b6b3000b13f35f3c09a0cd3741e8128
Casey Dahlin [Wed, 18 Nov 2015 21:42:30 +0000 (21:42 +0000)]
Merge "Revert "Add support for unique_fds and vectors of file descriptors""
am:
5cd09786eb
* commit '
5cd09786eb4ff6e99351e8a317205a5efd12ac74':
Revert "Add support for unique_fds and vectors of file descriptors"
Casey Dahlin [Wed, 18 Nov 2015 21:33:48 +0000 (21:33 +0000)]
Merge "Revert "Add support for unique_fds and vectors of file descriptors""
Casey Dahlin [Wed, 18 Nov 2015 21:30:02 +0000 (21:30 +0000)]
Revert "Add support for unique_fds and vectors of file descriptors"
This reverts commit
9626d88882972d45576dcceedc037d2e9843196b.
Change-Id: I6121f388d17c6f2d0cf6f31bc42f0804dd72aba2
Casey Dahlin [Wed, 18 Nov 2015 21:04:07 +0000 (21:04 +0000)]
Merge "Add support for unique_fds and vectors of file descriptors"
am:
b1819fc295
* commit '
b1819fc295811ca3a005042a80149c8d0655211f':
Add support for unique_fds and vectors of file descriptors
Casey Dahlin [Wed, 18 Nov 2015 20:54:52 +0000 (20:54 +0000)]
Merge "Add support for unique_fds and vectors of file descriptors"
Casey Dahlin [Thu, 5 Nov 2015 20:17:29 +0000 (12:17 -0800)]
Add support for unique_fds and vectors of file descriptors
Change-Id: Ic61e69d9db438b4686032459c896aed2a482c9a5
Test: Unit tests pass
Bug:
25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
Christopher Wiley [Wed, 18 Nov 2015 16:24:53 +0000 (16:24 +0000)]
Merge "libbinder: Add binder::Status type"
am:
babed3ea52
* commit '
babed3ea523822f4f5084c3e8a951f2cdf924695':
libbinder: Add binder::Status type
Christopher Wiley [Wed, 18 Nov 2015 16:18:30 +0000 (16:18 +0000)]
Merge "libbinder: Add binder::Status type"
Christopher Wiley [Mon, 9 Nov 2015 23:06:15 +0000 (15:06 -0800)]
libbinder: Add binder::Status type
This object implements equivalent functionality to the Java logic which
serializes and re-throws exceptions from services.
Bug:
25615695
Test: Integration test for generated AIDL code reveals this to work
correctly.
Change-Id: Ic80c9def0dd232582ea9c49717ec50894af6bfc2
Todd Kennedy [Tue, 17 Nov 2015 22:22:30 +0000 (22:22 +0000)]
Merge "use negative mask"
am:
4e427f0aab
* commit '
4e427f0aabf89b118b9a8f2b128f71a058755ba7':
use negative mask
Todd Kennedy [Tue, 17 Nov 2015 21:48:31 +0000 (21:48 +0000)]
Merge "use negative mask"
Todd Kennedy [Mon, 16 Nov 2015 22:41:36 +0000 (14:41 -0800)]
use negative mask
the test should be for _invalid_ bits; as it's written,
it tests for valid bits
Change-Id: Id5e42e865449a7877fe58aca9fb47675fa7452c9
Calin Juravle [Mon, 16 Nov 2015 11:20:25 +0000 (11:20 +0000)]
Merge "Remove obsolete profile handling from installd."
am:
8161da7a0e
* commit '
8161da7a0e54bc4af36e49353e4caad02de384dc':
Remove obsolete profile handling from installd.
Calin Juravle [Mon, 16 Nov 2015 11:07:38 +0000 (11:07 +0000)]
Merge "Remove obsolete profile handling from installd."
Casey Dahlin [Fri, 13 Nov 2015 22:18:11 +0000 (22:18 +0000)]
Merge "Use templates for write*Vector methods"
am:
81960facb6
* commit '
81960facb673740acd41b72d21febea16ba4986c':
Use templates for write*Vector methods
Casey Dahlin [Fri, 13 Nov 2015 22:15:01 +0000 (22:15 +0000)]
Merge "Use templates for write*Vector methods"
Casey Dahlin [Fri, 13 Nov 2015 21:46:29 +0000 (13:46 -0800)]
Use templates for write*Vector methods
Change-Id: I86223bd54940ebe3e8f090b7786ddfa3ee57195e
Test: AIDL integration tests still pass
Bug: None
Signed-off-by: Casey Dahlin <sadmac@google.com>
Elliott Hughes [Fri, 13 Nov 2015 20:28:00 +0000 (20:28 +0000)]
Merge "Move dumpstate to top -H rather than top -t."
am:
20986bf383
* commit '
20986bf3830dabae74837660403c43f92c9131bd':
Move dumpstate to top -H rather than top -t.
Elliott Hughes [Fri, 13 Nov 2015 20:23:22 +0000 (20:23 +0000)]
Merge "Move dumpstate to top -H rather than top -t."
Elliott Hughes [Fri, 13 Nov 2015 19:32:48 +0000 (11:32 -0800)]
Move dumpstate to top -H rather than top -t.
Change-Id: Ibc26b51e92425b2de7870a7a2890fc3566909cda
Christopher Wiley [Thu, 12 Nov 2015 22:35:00 +0000 (22:35 +0000)]
Merge "libbinder: Return UNEXPECTED_NULL when appropriate"
am:
41e50f99bc
* commit '
41e50f99bc3b832df2b7249ce1d3fc92e718c98d':
libbinder: Return UNEXPECTED_NULL when appropriate
Christopher Wiley [Thu, 12 Nov 2015 22:25:04 +0000 (22:25 +0000)]
Merge "libbinder: Return UNEXPECTED_NULL when appropriate"
Christopher Wiley [Tue, 10 Nov 2015 17:44:30 +0000 (09:44 -0800)]
libbinder: Return UNEXPECTED_NULL when appropriate
Return a meaningful and consistent error code when libbinder encounters
a null reference that it didn't expect. This allows us to detect these
situations and cause a corresponding NullPointerException to be thrown
on the remote callsite.
While here, consolidate places we read vector<T> from a parcel into a
single templated version. This dramatically reduces code duplication.
Bug:
25617251
Test: Integration tests asserting that vectors serialize correctly
passes. Integration test asserting that we throw
NullPointerException on seeing a null reference also passes.
Change-Id: Ia59c264884ec89539c1b99cd7bd28ac201b5b7ac
Nick Kralevich [Mon, 9 Nov 2015 20:28:00 +0000 (20:28 +0000)]
Merge "Allow read access to /proc entries for other UIDs"
am:
fd53598220
* commit '
fd53598220e19fbb91270f1f1831f6c69c669aaa':
Allow read access to /proc entries for other UIDs
Nick Kralevich [Mon, 9 Nov 2015 20:05:20 +0000 (20:05 +0000)]
Merge "Allow read access to /proc entries for other UIDs"
Nick Kralevich [Sun, 8 Nov 2015 01:05:41 +0000 (17:05 -0800)]
Allow read access to /proc entries for other UIDs
Allow dumpstate (aka adb bugreport), servicemanager, and
surfaceflinger to access /proc entries associated with other UIDs.
Bug:
23310674
Change-Id: I385dcf0db3376ba979409cbe6fe1a468d36237ef
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"
Calin Juravle [Wed, 4 Nov 2015 14:47:37 +0000 (14:47 +0000)]
Remove obsolete profile handling from installd.
Bug:
24698874
Bug:
17173268
Change-Id: I140d70262f8f8fa7afd52c3cf63b4abaf401a479
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 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>
Riley Andrews [Tue, 3 Nov 2015 05:01:34 +0000 (21:01 -0800)]
Add ipi tracing to irq tracing.
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: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
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: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
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>
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
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"
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 [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""
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)]
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
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