OSDN Git Service
Todd Kennedy [Tue, 17 Nov 2015 22:28:03 +0000 (22:28 +0000)]
Merge "use negative mask" am:
4e427f0aab
am:
469295f68e
* commit '
469295f68e283977b0a5ff7e04a4413697f7eee7':
use negative mask
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:28:16 +0000 (11:28 +0000)]
Merge "Remove obsolete profile handling from installd." am:
8161da7a0e
am:
a51f45a601
* commit '
a51f45a6014907d0e0fd06f0fcffed592c843419':
Remove obsolete profile handling from installd.
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:20:05 +0000 (22:20 +0000)]
Merge "Use templates for write*Vector methods" am:
81960facb6
am:
d6bb937114
* commit '
d6bb937114a945dd1ebe4299ab2dab1bd6ff795e':
Use templates for write*Vector methods
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:30:45 +0000 (20:30 +0000)]
Merge "Move dumpstate to top -H rather than top -t." am:
20986bf383
am:
5e02b1bfbb
* commit '
5e02b1bfbbaedfb3703cd0f56e6bcac3aa4edfd9':
Move dumpstate to top -H rather than top -t.
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
Lajos Molnar [Fri, 13 Nov 2015 00:21:08 +0000 (00:21 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am:
f1de4547c1 am:
37b8c1f77c am:
8abb053a2e
am:
bc9bc0e0fc
* commit '
bc9bc0e0fc75097e48feff9bb954de648930817c':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:16:41 +0000 (00:16 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am:
f1de4547c1 am:
37b8c1f77c
am:
8abb053a2e
* commit '
8abb053a2ea021c649e481813e45860add946e36':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:11:57 +0000 (00:11 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am:
f1de4547c1
am:
37b8c1f77c
* commit '
37b8c1f77cab3ee9809bcbad81d765ec5bddedce':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:07:04 +0000 (00:07 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
am:
f1de4547c1
* commit '
f1de4547c14467c03b00187efde5381dd1fb265c':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:00:19 +0000 (00:00 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
Christopher Wiley [Thu, 12 Nov 2015 22:40:07 +0000 (22:40 +0000)]
Merge "libbinder: Return UNEXPECTED_NULL when appropriate" am:
41e50f99bc
am:
fb1f4cf4d4
* commit '
fb1f4cf4d481f1614bae977b187cdb888c8af09a':
libbinder: Return UNEXPECTED_NULL when appropriate
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:30:04 +0000 (20:30 +0000)]
Merge "Allow read access to /proc entries for other UIDs" am:
fd53598220
am:
877b5daecc
* commit '
877b5daeccaf25a84745b2dfc9f6c5d4f3787ccf':
Allow read access to /proc entries for other UIDs
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: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"
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: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: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>
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: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
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: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
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
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
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
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
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
Ian Pedowitz [Thu, 22 Oct 2015 22:38:23 +0000 (22:38 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e am:
159a5c3372
am:
7a2643cd77
* commit '
7a2643cd77f1836844032f8a14f3c03a40c4e581':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:33:58 +0000 (22:33 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e
am:
159a5c3372
* commit '
159a5c337250613c166ae45b2811861f70c733bd':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:32:07 +0000 (22:32 +0000)]
Revert "Track ashmem memory usage in Parcel"
am:
6880307e8e
* commit '
6880307e8e35a6c484942443fb4ddd6173126152':
Revert "Track ashmem memory usage in Parcel"
Flanker [Thu, 22 Oct 2015 22:28:01 +0000 (22:28 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825
am:
9830f11dc6
* commit '
9830f11dc6b6aa4001c79147966fdb9eaa71c2f2':
add number constraint for samples per MotionEvent
Ian Pedowitz [Thu, 22 Oct 2015 22:08:10 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"
This reverts commit
e2f499fb734bc30a1e1c947112caa0727349b6ed.
Bug:
25169267
Bug:
25191602
Bug:
25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0