OSDN Git Service
Qiwen Zhao [Thu, 19 Nov 2015 23:41:04 +0000 (15:41 -0800)]
Merge commit '
08bb145a3c82d86ee26d3c567a929a2db41d9101' into mnc-dr2-dev-plus-aosp
Casey Dahlin [Thu, 19 Nov 2015 23:32:45 +0000 (23:32 +0000)]
Add methods to Parcel for bool and char and byte
am:
a377491405 -s ours
* commit '
a37749140585cd76178a93faf3abd27cd2fc30dc':
Add methods to Parcel for bool and char and byte
Nick Kralevich [Thu, 19 Nov 2015 23:23:53 +0000 (23:23 +0000)]
handle size_t > java max int size
am:
cfe27deac7
* commit '
cfe27deac7e0ede89a78b9f03fb4a4159d68be8e':
handle size_t > java max int size
Dan Austin [Thu, 19 Nov 2015 23:23:48 +0000 (23:23 +0000)]
Benign unsigned integer overflow in Parcel
am:
f28b295df9
* commit '
f28b295df90da3b9610cc5d6100039e54d95f49a':
Benign unsigned integer overflow in Parcel
Bailey Forrest [Thu, 19 Nov 2015 23:23:43 +0000 (23:23 +0000)]
binder: Change from C11 <stdatomic.h> to C++11 <atomic>.
am:
2ab8014d78
* commit '
2ab8014d78fe89b022cd8f69024112780fecdd30':
binder: Change from C11 <stdatomic.h> to C++11 <atomic>.
Riley Andrews [Thu, 19 Nov 2015 22:12:12 +0000 (22:12 +0000)]
Merge "Add support for new sched kernel tracepoint" am:
61c9506a09
am:
31a851cd75
* commit '
31a851cd7580d6babdc011b3f50da760e7e4274a':
Add support for new sched kernel tracepoint
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.
Todd Kennedy [Thu, 19 Nov 2015 19:15:38 +0000 (19:15 +0000)]
Allow using the JIT
am:
806313fe81 -s ours
* commit '
806313fe8168fe7e68c21a839966fd6c31ec8189':
Allow using the JIT
Todd Kennedy [Thu, 19 Nov 2015 18:54:20 +0000 (18:54 +0000)]
Pass dexopt flags as integer
am:
90907aca73 -s ours
* commit '
90907aca732cf5cbb80cc95993f2401857254069':
Pass dexopt flags as integer
Badhri Jagan Sridharan [Thu, 19 Nov 2015 16:30:45 +0000 (16:30 +0000)]
batteryservice: Add max charging voltage
am:
4e5a5adda8
* commit '
4e5a5adda807cec54df8c1f2ccf51830abe9b4e2':
batteryservice: Add max charging voltage
Casey Dahlin [Wed, 18 Nov 2015 21:48:42 +0000 (21:48 +0000)]
Merge "Revert "Add support for unique_fds and vectors of file descriptors"" am:
5cd09786eb
am:
fb92cfcd3e
* commit '
fb92cfcd3e8977a6cac0147de80bf2a0fb6a2d87':
Revert "Add support for unique_fds and vectors of file descriptors"
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:10:30 +0000 (21:10 +0000)]
Merge "Add support for unique_fds and vectors of file descriptors" am:
b1819fc295
am:
0dd1a5d2f4
* commit '
0dd1a5d2f4e69c5df233fa9468191c03dc9b639f':
Add support for unique_fds and vectors of file descriptors
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"
Todd Kjos [Mon, 16 Nov 2015 23:49:50 +0000 (15:49 -0800)]
Actively mangage EAS schedtune nodes
Move foreground tasks to /sys/fs/cgroup/stune/boost/tasks (boosted
weight in EAS scheduler). Move background tasks to
/sys/fs/cgroup/stune/tasks (default weight). For services started
with init, set "foreground" services to boosted.
Change-Id: I0e489fad9510727c13e6754dabaf311c2391f395
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:30:45 +0000 (16:30 +0000)]
Merge "libbinder: Add binder::Status type" am:
babed3ea52
am:
d352198294
* commit '
d3521982942874f4149ebc686be581d0ff857734':
libbinder: Add binder::Status type
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"
Casey Dahlin [Tue, 20 Oct 2015 01:12:18 +0000 (18:12 -0700)]
Add read/write methods for vectors
Also a readString16 with the expected semantics.
Test: Unit tests pass
Bug:
25012838
Signed-off-by: Casey Dahlin <sadmac@google.com>
(cherry picked from commit
451ff582d730e27f4e22d9f158f8ee24d1bc2729)
Change-Id: Iaecde0e94c4cd11126b7efbc2d9876ddae16b090
Casey Dahlin [Thu, 15 Oct 2015 22:44:59 +0000 (15:44 -0700)]
Add methods to Parcel for bool and char and byte
We lift these to int, but handling the details of that here will be better
than having AIDL generate casting code all the time.
Test: unit tests pass
Bug:
24981507
Signed-off-by: Casey Dahlin <sadmac@google.com>
(cherry picked from commit
d6848f52e60be17b7f0992be7827dcae4ea2efb1)
Change-Id: I471586463360c37e837b1b8f862da3b5e17f905d
Nick Kralevich [Wed, 16 Sep 2015 16:49:15 +0000 (09:49 -0700)]
handle size_t > java max int size
Cleanly abort if we would have returned a value which can't be safely
handled by the java APIs. I'm not sure this code is reachable, but
adding the check just in case.
Bug:
16676699
(cherry picked from commit
3f6b702b5834330ef061f4ed97677ae90a541f23)
Change-Id: Iddc16f32cb5d46219a4dcb3548bcfeaade0f9c9e
Dan Austin [Thu, 10 Sep 2015 20:46:02 +0000 (13:46 -0700)]
Benign unsigned integer overflow in Parcel
The realloc case in continueWrite did not update the
gParcelGlobalAllocCount value when an allocation occurred.
In addition, there are conditions that could cause the
gParcelGlobalAllocCount value to be decremented below 0, resulting
in a benign unsigned integer overflow that can cause corrupted values
to be returned through system profiling mechanisms.
BUG:
23972600
(cherry picked from commit
48fd7b457bb0657253d6012e787f50498b32ae42)
Change-Id: I1ad2ac02ab370402481550f6ab8f21fce42455e4
Bailey Forrest [Wed, 19 Aug 2015 00:15:10 +0000 (17:15 -0700)]
binder: Change from C11 <stdatomic.h> to C++11 <atomic>.
(cherry picked from commit
6913c46492f1153cecc647a87217fbb0b0d19689)
Change-Id: I6e1c62425864e000eda56fe4ba697ac429438659
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: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
Todd Kennedy [Fri, 25 Sep 2015 21:45:37 +0000 (14:45 -0700)]
Allow using the JIT
Instead of the JIT only being available for eng builds [or configurable
via environment variable], allow the JIT to be enabled programatically.
(cherry picked from commit
12434f8cce66a753ef49c07b503f9625e01366c8)
Change-Id: Id3c5ae227ed400e489bb723a56c516dfc12acd89
Todd Kennedy [Fri, 25 Sep 2015 14:47:47 +0000 (07:47 -0700)]
Pass dexopt flags as integer
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.
(cherry picked from commit
76e767ca14bcbb4bc809cd1279ece82a3aabe8a4)
Change-Id: I35542aa73ca57b0e765d19b1339b1429849c1ae8
Badhri Jagan Sridharan [Tue, 27 Oct 2015 20:37:05 +0000 (13:37 -0700)]
batteryservice: Add max charging voltage
Bug:
25229483
Change-Id: I4b6dd13870c41907c708f32412261efdca826023
(cherry picked from commit
06f511b469c7ba69d889cc5252e908f1084c8ff5)
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"