OSDN Git Service
Qiwen Zhao [Fri, 20 Nov 2015 03:49:12 +0000 (03:49 +0000)]
Merge commit \'
32d29a534b0ed403230c2f213e9391d8ce76318c\' into mnc-dr2-dev-plus-aosp
am:
27cc9511e6
* commit '
27cc9511e69337849ec00400a8f44342885b7aa4':
Use templates for write*Vector methods
Qiwen Zhao [Fri, 20 Nov 2015 03:49:06 +0000 (03:49 +0000)]
Merge commit \'
6264c4c194e0bbcd060409e0e8c0abfaae3bdf10\' into mnc-dr2-dev-plus-aosp
am:
a10bd04544
* commit '
a10bd04544feab7a5bcc4fa4f6fb3f10513f1c31':
libbinder: Return UNEXPECTED_NULL when appropriate
Qiwen Zhao [Fri, 20 Nov 2015 03:49:01 +0000 (03:49 +0000)]
Merge commit \'
3e4b6d219f1f015cdf16a5ae750acd8050d7d9d9\' into mnc-dr2-dev-plus-aosp
am:
623a41482c
* commit '
623a41482c0d80ad659460fa741ebf366e6b43b8':
Add support for reading/writing a vector of binders
Qiwen Zhao [Fri, 20 Nov 2015 03:48:56 +0000 (03:48 +0000)]
Merge commit \'
714a3ab7ae00f768a92f213119181a7422342c8a\' into mnc-dr2-dev-plus-aosp
am:
0c2bfcaa89
* commit '
0c2bfcaa896c8acf9a4a9fc23d089a9525b12a7a':
Fix bug in byte vector serialization
Qiwen Zhao [Fri, 20 Nov 2015 03:48:51 +0000 (03:48 +0000)]
Merge commit \'
930a572ec310359844d2ab184de85b1ecf1d58be\' into mnc-dr2-dev-plus-aosp
am:
c54f2e8492
* commit '
c54f2e84929bea4d42ef7ca78b506587f1724394':
Add readStrongBinder that takes an interface
Qiwen Zhao [Fri, 20 Nov 2015 03:48:45 +0000 (03:48 +0000)]
Merge commit \'
489931b6ce22434b943bdf8381b376f429b58633\' into mnc-dr2-dev-plus-aosp
am:
9a39a71ec4
* commit '
9a39a71ec46936d1fb5862ae2114526342bc1442':
libbinder: Fix out of bounds in readBoolVector
Qiwen Zhao [Fri, 20 Nov 2015 03:48:40 +0000 (03:48 +0000)]
Merge commit \'
210648c40e7c2001cc2a52df532a6ae8f89ac029\' into mnc-dr2-dev-plus-aosp
am:
516d8d99f2
* commit '
516d8d99f226a848a56578215f6025b6fa33bae1':
Fix benign integer overflow in printHexDump
Qiwen Zhao [Fri, 20 Nov 2015 03:48:35 +0000 (03:48 +0000)]
Merge commit \'
a5bcc9590a76c2ec0be5a6e8d1db8d8a69d80753\' into mnc-dr2-dev-plus-aosp
am:
951dd8e487
* commit '
951dd8e4876fe4cc6691d2aa62f9da9735766eda':
Fix build breakage due to extraneous dereference
Qiwen Zhao [Fri, 20 Nov 2015 03:48:30 +0000 (03:48 +0000)]
Merge commit \'
08bb145a3c82d86ee26d3c567a929a2db41d9101\' into mnc-dr2-dev-plus-aosp
am:
94e7819141
* commit '
94e7819141aa17d565a4d5e190609e03152eb257':
Add read/write methods for vectors
Casey Dahlin [Fri, 20 Nov 2015 03:48:25 +0000 (03:48 +0000)]
Add methods to Parcel for bool and char and byte am:
a377491405 -s ours
am:
e19e697986
* commit '
e19e69798620777aa88cd82330926640f024e083':
Add methods to Parcel for bool and char and byte
Nick Kralevich [Fri, 20 Nov 2015 03:48:20 +0000 (03:48 +0000)]
handle size_t > java max int size am:
cfe27deac7
am:
dfefb3c7c8
* commit '
dfefb3c7c87063783b0baeee9c6b534526f51658':
handle size_t > java max int size
Dan Austin [Fri, 20 Nov 2015 03:48:14 +0000 (03:48 +0000)]
Benign unsigned integer overflow in Parcel am:
f28b295df9
am:
d210ee62a8
* commit '
d210ee62a8e39abfb57bc272a3facec17118b05a':
Benign unsigned integer overflow in Parcel
Bailey Forrest [Fri, 20 Nov 2015 03:48:08 +0000 (03:48 +0000)]
binder: Change from C11 <stdatomic.h> to C++11 <atomic>. am:
2ab8014d78
am:
1bb0ca35a8
* commit '
1bb0ca35a813876bfa65843219581bc9c37d1d91':
binder: Change from C11 <stdatomic.h> to C++11 <atomic>.
Pablo Ceballos [Fri, 20 Nov 2015 01:28:49 +0000 (01:28 +0000)]
Merge "SF: Don't use pointer if promote() fails"
Qiwen Zhao [Thu, 19 Nov 2015 23:41:52 +0000 (15:41 -0800)]
Merge commit '
32d29a534b0ed403230c2f213e9391d8ce76318c' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:48 +0000 (15:41 -0800)]
Merge commit '
6264c4c194e0bbcd060409e0e8c0abfaae3bdf10' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:45 +0000 (15:41 -0800)]
Merge commit '
3e4b6d219f1f015cdf16a5ae750acd8050d7d9d9' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:42 +0000 (15:41 -0800)]
Merge commit '
714a3ab7ae00f768a92f213119181a7422342c8a' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:12 +0000 (15:41 -0800)]
Merge commit '
930a572ec310359844d2ab184de85b1ecf1d58be' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:11 +0000 (15:41 -0800)]
Merge commit '
489931b6ce22434b943bdf8381b376f429b58633' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:08 +0000 (15:41 -0800)]
Merge commit '
210648c40e7c2001cc2a52df532a6ae8f89ac029' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:06 +0000 (15:41 -0800)]
Merge commit '
a5bcc9590a76c2ec0be5a6e8d1db8d8a69d80753' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:04 +0000 (15:41 -0800)]
Merge commit '
08bb145a3c82d86ee26d3c567a929a2db41d9101' into mnc-dr2-dev-plus-aosp
Felipe Leme [Thu, 19 Nov 2015 23:38:38 +0000 (23:38 +0000)]
Merge "Fixed check if zip file was generated properly."
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
Felipe Leme [Thu, 19 Nov 2015 23:30:35 +0000 (15:30 -0800)]
Fixed check if zip file was generated properly.
During the earlier development stages, this function was returning an
int and later it was changed to boolean, but the check was not updated.
BUG:
25563823
Change-Id: I77f50bf2184d5dd4da2156a5eca4c8a555b567a4
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>.
Pablo Ceballos [Thu, 19 Nov 2015 22:39:14 +0000 (14:39 -0800)]
SF: Don't use pointer if promote() fails
Bug
25759725
Change-Id: I51f82154bf86ded24503c07f1932b115aa709cd4
Jeff Sharkey [Thu, 19 Nov 2015 22:36:13 +0000 (22:36 +0000)]
Merge "Temporarily relax device-encryption failures."
Jeff Sharkey [Thu, 19 Nov 2015 22:35:27 +0000 (15:35 -0700)]
Temporarily relax device-encryption failures.
Long-term fix is to get vold connected before doing initial package
scan, and prepare all user directories.
Bug:
25796509
Change-Id: Ibcfc44411e9921cf3fa3d0510d300808a2a62e7e
Riley Andrews [Thu, 19 Nov 2015 22:18:01 +0000 (22:18 +0000)]
Merge "Add support for new sched kernel tracepoint" am:
61c9506a09 am:
31a851cd75
am:
3619cb2909
* commit '
3619cb2909cbd21cfd080fb1142fd77207cee1d8':
Add support for new sched kernel tracepoint
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:24:44 +0000 (19:24 +0000)]
Allow using the JIT am:
806313fe81 -s ours
am:
bba52a6016
* commit '
bba52a60167a1b7d7f4f5f1b86aa7247373fc6e5':
Allow using the JIT
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 19:06:39 +0000 (19:06 +0000)]
Pass dexopt flags as integer am:
90907aca73 -s ours
am:
d2da0be029
* commit '
d2da0be029aeeb4bf18616918cc435d3318534c7':
Pass dexopt flags as integer
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
Jeff Sharkey [Thu, 19 Nov 2015 18:45:41 +0000 (18:45 +0000)]
Merge "More device-encrypted directory work."
Jeff Sharkey [Wed, 18 Nov 2015 21:15:17 +0000 (14:15 -0700)]
More device-encrypted directory work.
Unify package directory creation logic, and always create user_de
directories to be ready for emulation mode. Also clean up the new
user_de directories on user deletion, package uninstallation, and
data clearing. Also run restorecon over the new user_de paths.
Bug:
22358539
Change-Id: I65ab1562db8455dae6e99dbd8965409b1bf3c6b0
Badhri Jagan Sridharan [Thu, 19 Nov 2015 16:37:06 +0000 (16:37 +0000)]
batteryservice: Add max charging voltage am:
4e5a5adda8
am:
e333d98885
* commit '
e333d98885b27fcd1da91ea549c6dfafb08ffd86':
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
Nicolas Capens [Fri, 6 Nov 2015 15:10:21 +0000 (10:10 -0500)]
Load the emulation libraries only when qemu.gles=1
Bug
25467020
Change-Id: I4a47f369078af03e4146b3b96a7e7a8e8390da61
(cherry picked from commit
8404ebc7487ebcf317e88c78cbb81e238fb55c3f)
Casey Dahlin [Thu, 19 Nov 2015 05:47:33 +0000 (05:47 +0000)]
Merge "Revert "Add support for unique_fds and vectors of file descriptors"" am:
5cd09786eb am:
fb92cfcd3e
am:
4c9066efd0
* commit '
4c9066efd0de825247d77c227f264ab4423110be':
Revert "Add support for unique_fds and vectors of file descriptors"
Casey Dahlin [Thu, 19 Nov 2015 05:46:48 +0000 (05:46 +0000)]
Merge "Add support for unique_fds and vectors of file descriptors" am:
b1819fc295 am:
0dd1a5d2f4
am:
7dff1b17af
* commit '
7dff1b17afe10c042b799f8e7d4fc9751f65d144':
Add support for unique_fds and vectors of file descriptors
Todd Kjos [Thu, 19 Nov 2015 05:46:27 +0000 (05:46 +0000)]
Actively mangage EAS schedtune nodes
am:
fedb5f4208
* commit '
fedb5f4208669480684d116db1ec2234a6bdaa26':
Actively mangage EAS schedtune nodes
Christopher Wiley [Thu, 19 Nov 2015 03:24:18 +0000 (03:24 +0000)]
Merge "libbinder: Add binder::Status type" am:
babed3ea52 am:
d352198294
am:
a62a2d7629
* commit '
a62a2d7629cf4ff7681912ee488585652e09b63a':
libbinder: Add binder::Status type
Todd Kennedy [Thu, 19 Nov 2015 00:17:33 +0000 (00:17 +0000)]
Merge "use negative mask" am:
4e427f0aab am:
469295f68e
am:
d0711b42b7
* commit '
d0711b42b757bcc4ffc2ad8a9989cf728d4bb034':
use negative mask
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 [Fri, 13 Nov 2015 21:46:29 +0000 (13:46 -0800)]
Use templates for write*Vector methods
Test: AIDL integration tests still pass
Bug: None
Signed-off-by: Casey Dahlin <sadmac@google.com>
(cherry picked from commit
5f0625695ce6999ec70f5699f70a8a0fa84a1bf6)
Change-Id: I902dd90faa77cba7a2212793bd26a3cfe49fc443
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.
(cherry picked from commit
4db672ddccb02b2bd70ddb4812c00a5060174c93)
Change-Id: Icdb0b29aaff93e85884314c0304cd786e7b4e34f
Casey Dahlin [Tue, 3 Nov 2015 21:50:37 +0000 (13:50 -0800)]
Add support for reading/writing a vector of binders
Test: unit tests pass
Bug:
24470786
Signed-off-by: Casey Dahlin <sadmac@google.com>
(cherry picked from commit
eb8e15f9bb29f8794f8be819530631c358fd6a15)
Change-Id: Ia5a282b80c8dea65db296a74edba4f4d4e1000de
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.
(cherry picked from commit
f0fc52b59be0bf39912f7b698d9bde26415a6096)
Change-Id: I0afd4c9655d642613fd9012c7c1e4e9fc4edd1db
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.
Test: unit tests
Bug:
23600713
Signed-off-by: Casey Dahlin <sadmac@google.com>
(cherry picked from commit
f0c13772d95486d98f034361883b2415bb26a614)
Change-Id: I69e8b534343c299c25cfb591dbdf122860c9ccc5
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.
(cherry picked from commit
97887989495318803643c91b196b6bcabf2a7a03)
Change-Id: If9b69836092f40d121a7e62d890c2e1c41080448
Dan Austin [Wed, 21 Oct 2015 18:28:59 +0000 (11:28 -0700)]
Fix benign integer overflow in printHexDump
There is an instance where an unsigned integer is multiplied by -1.
Refactor the code to eliminate this operation.
Bug:
25085348
(cherry picked from commit
c2bf8e837ecf36639425fc3015cce078f6a08fb9)
Change-Id: I7efa5c3c2f4ff7bd895c1cc74ec244561dc59bb8
Casey Dahlin [Tue, 20 Oct 2015 23:26:23 +0000 (16:26 -0700)]
Fix build breakage due to extraneous dereference
(cherry picked from commit
1515ea103e00f6672afad4d27f2e0dec5648d7b6)
Change-Id: I6dd029f5c2a07cfe593da40906f3402ef7a175cc
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
Calin Juravle [Wed, 18 Nov 2015 00:20:44 +0000 (00:20 +0000)]
Merge "Remove obsolete profile handling from installd." am:
8161da7a0e am:
a51f45a601
am:
357cb908fa
* commit '
357cb908faa88b915c1d2c977f16e533e855f19f':
Remove obsolete profile handling from installd.
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"
Badhri Jagan Sridharan [Tue, 17 Nov 2015 19:53:07 +0000 (19:53 +0000)]
batteryservice: Add max charging voltage
am:
4e5a5adda8
* commit '
4e5a5adda807cec54df8c1f2ccf51830abe9b4e2':
batteryservice: Add max charging voltage
Christopher Ferris [Tue, 17 Nov 2015 00:10:09 +0000 (00:10 +0000)]
Merge "Fix a few bugs related to dumping files."
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
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
Christopher Ferris [Thu, 12 Nov 2015 22:01:56 +0000 (14:01 -0800)]
Fix a few bugs related to dumping files.
Fixes:
- Fix double print of header in dump_file.
- Fix a few possible file descriptor leaks.
- Add /d/ as another directory which should be skipped when printing out
last mod time of a file.
- Fix possible crash if the path passed to _dump_file_from_fd is less than
the length of one of the directory checks.
Change-Id: I450dfab76fd0ce4d4dca9ed39c82a980054f3cc3
Felipe Leme [Mon, 16 Nov 2015 22:10:20 +0000 (22:10 +0000)]
Merge "Added option (-z) to generate a zipfile with the bugreport."
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."
keunyoung [Fri, 16 Oct 2015 22:21:43 +0000 (15:21 -0700)]
add vehicle_network_service to stack dump
bug:
24095928
Change-Id: I32874f36003cd0dfacc8d9d5b568e6fc963bfa43
Pablo Ceballos [Fri, 13 Nov 2015 22:44:16 +0000 (22:44 +0000)]
Merge "SF: Initialize mSingleBufferMode"
Casey Dahlin [Fri, 13 Nov 2015 22:22:02 +0000 (22:22 +0000)]
Merge "Use templates for write*Vector methods" am:
81960facb6 am:
d6bb937114
am:
18f0bd5731
* commit '
18f0bd57311457a0a9f6229c4c409d985651e56d':
Use templates for write*Vector methods
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>