OSDN Git Service
Todd Kennedy [Fri, 25 Sep 2015 23:00:12 +0000 (23:00 +0000)]
am
1307cbb3: am
a5359950: am
d529cd47: Merge "Pass dexopt flags as integer"
* commit '
1307cbb38a424cf299f3240a679649070348cf55':
Pass dexopt flags as integer
Todd Kennedy [Fri, 25 Sep 2015 22:17:08 +0000 (22:17 +0000)]
am
a5359950: am
d529cd47: Merge "Pass dexopt flags as integer"
* commit '
a5359950298f0bd5833ab72b7a26aef9fc45056f':
Pass dexopt flags as integer
Todd Kennedy [Fri, 25 Sep 2015 22:11:44 +0000 (22:11 +0000)]
am
d529cd47: Merge "Pass dexopt flags as integer"
* commit '
d529cd470afa98512bf2eab7a58dae5a9b6e4847':
Pass dexopt flags as integer
Todd Kennedy [Fri, 25 Sep 2015 21:41:37 +0000 (21:41 +0000)]
Merge "Pass dexopt flags as integer"
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.
Change-Id: I35542aa73ca57b0e765d19b1339b1429849c1ae8
Naveen Leekha [Fri, 25 Sep 2015 00:14:56 +0000 (00:14 +0000)]
am
be802d2c: am
bac4a44a: am
53aa7d80: am
b0127aad: am
69412a51: am
c4bd7211: resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
* commit '
be802d2c08c640cb05a2ce2879a7d1f3ead88398':
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Fri, 25 Sep 2015 00:04:16 +0000 (00:04 +0000)]
am
bac4a44a: am
53aa7d80: am
b0127aad: am
69412a51: am
c4bd7211: resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
* commit '
bac4a44ac909dbf09ce7a25bd2173164fc437c74':
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 23:55:17 +0000 (23:55 +0000)]
am
53aa7d80: am
b0127aad: am
69412a51: am
c4bd7211: resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
* commit '
53aa7d80cf64f2f2c0c935be8528a513b32341b2':
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 23:44:56 +0000 (23:44 +0000)]
am
b0127aad: am
69412a51: am
c4bd7211: resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
* commit '
b0127aadafbf3b314475e48772fdcc17939c5a9c':
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 23:35:41 +0000 (23:35 +0000)]
am
69412a51: am
c4bd7211: resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
* commit '
69412a51f58fa9450f1cb077c8d4b6410128d993':
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 23:27:31 +0000 (23:27 +0000)]
am
c4bd7211: resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
* commit '
c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 22:56:43 +0000 (22:56 +0000)]
am
94d21991: am
b062a7a1: am
62e5463e: am
83e60e42: am
571e27e2: am
e889592e: am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
94d219913bfbb21b4d3708bc853b6edc6c0c7c8b':
Initialize local variables to avoid data leak
Michael Wright [Thu, 24 Sep 2015 22:56:42 +0000 (22:56 +0000)]
am
21d2fe72: (-s ours) am
dd71ee89: am
0a77df93: am
ce92ce9b: Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
* commit '
21d2fe7254188908bd1b16ec1ecf91d3d5e5440e':
DO NOT MERGE Cancel touches as well as pointer gestures.
Naveen Leekha [Thu, 24 Sep 2015 22:55:21 +0000 (15:55 -0700)]
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Change-Id: I543df164076b44578b14d41031800bb62b81586d
Naveen Leekha [Thu, 24 Sep 2015 22:48:08 +0000 (22:48 +0000)]
am
b062a7a1: am
62e5463e: am
83e60e42: am
571e27e2: am
e889592e: am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
b062a7a10d014c30f2c59761010fa4e4f876e85c':
Initialize local variables to avoid data leak
Michael Wright [Thu, 24 Sep 2015 22:48:07 +0000 (22:48 +0000)]
am
dd71ee89: am
0a77df93: am
ce92ce9b: Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
* commit '
dd71ee89afcb8cc27bcffa01cd0f8fc0db36fd65':
DO NOT MERGE Cancel touches as well as pointer gestures.
Naveen Leekha [Thu, 24 Sep 2015 22:40:55 +0000 (22:40 +0000)]
am
62e5463e: am
83e60e42: am
571e27e2: am
e889592e: am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
62e5463e248d581ee4faa58c631541b994500793':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:31:42 +0000 (22:31 +0000)]
am
83e60e42: am
571e27e2: am
e889592e: am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
83e60e42573ebc1bb06a408170bcdac2824e8dd6':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:26:22 +0000 (22:26 +0000)]
am
571e27e2: am
e889592e: am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
571e27e20e30560985d7c3a3ba8885693695b0fc':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:20:59 +0000 (22:20 +0000)]
am
e889592e: am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
e889592e33891c9b88ff6ba655426118f8ef12ee':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:13:06 +0000 (22:13 +0000)]
am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
73887c0864c9a928db6f66bd48c5aea4d31d9a8b':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:00:33 +0000 (22:00 +0000)]
am
b414255f: Initialize local variables to avoid data leak
* commit '
b414255f53b560a06e642251535b019327ba0d7b':
Initialize local variables to avoid data leak
Todd Kennedy [Thu, 24 Sep 2015 21:19:11 +0000 (21:19 +0000)]
am
2655e9d9: am
a037f97d: am
7f413889: Merge "Installd: Take boot status as dexopt parameter"
* commit '
2655e9d90ce92aaf58bdce02b7ce85eb0010058b':
Installd: Take boot status as dexopt parameter
Todd Kennedy [Thu, 24 Sep 2015 20:49:51 +0000 (20:49 +0000)]
am
a037f97d: am
7f413889: Merge "Installd: Take boot status as dexopt parameter"
* commit '
a037f97dcf15000154e73aea4e92248c17a586f8':
Installd: Take boot status as dexopt parameter
Todd Kennedy [Thu, 24 Sep 2015 20:39:15 +0000 (20:39 +0000)]
am
7f413889: Merge "Installd: Take boot status as dexopt parameter"
* commit '
7f413889a3f0bff0c159141abb498650305f2089':
Installd: Take boot status as dexopt parameter
Todd Kennedy [Thu, 24 Sep 2015 20:35:07 +0000 (20:35 +0000)]
Merge "Installd: Take boot status as dexopt parameter"
Andreas Gampe [Mon, 21 Sep 2015 20:21:30 +0000 (13:21 -0700)]
Installd: Take boot status as dexopt parameter
Expect the boot status explicitly as a parameter so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug:
23898216
(cherry picked from commit
72ebebed876a62e719b098e43d9d516361bde029)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
Dan Austin [Wed, 23 Sep 2015 19:51:06 +0000 (19:51 +0000)]
am
c3af99f4: am
476398ab: am
0830bb16: Merge "Enable integer overflow sanitization in libinput."
* commit '
c3af99f441749b82c16a90ae4b0faaecf7cc079c':
Enable integer overflow sanitization in libinput.
Dan Austin [Wed, 23 Sep 2015 19:51:05 +0000 (19:51 +0000)]
am
4cf79dbb: am
0ba3db9e: am
bffbd09f: Merge "Eliminate multiple benign overflow conditions."
* commit '
4cf79dbbc9767b2bdb5bfa42825fba3a5afd954a':
Eliminate multiple benign overflow conditions.
Sergio Giro [Wed, 23 Sep 2015 19:51:04 +0000 (19:51 +0000)]
am
48d1d1fc: am
f1519eeb: am
64b83133: Merge "Remove usage of SharedBuffer"
* commit '
48d1d1fc902543ea16e5826a4739346714691d8c':
Remove usage of SharedBuffer
Michael Wright [Wed, 23 Sep 2015 19:50:30 +0000 (19:50 +0000)]
am
c2fa26c0: (-s ours) am
bc16fb98: am
cff01363: Merge commit \'
8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix
* commit '
c2fa26c0f5e6690efb9e99c88ffbb5064b816132':
DO NOT MERGE Revert "am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
Michael Wright [Wed, 23 Sep 2015 17:49:52 +0000 (17:49 +0000)]
am
0a77df93: am
ce92ce9b: Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
* commit '
0a77df93cb06cbd51527db6420250085ca9dd132':
DO NOT MERGE Cancel touches as well as pointer gestures.
Dan Austin [Wed, 23 Sep 2015 17:25:01 +0000 (17:25 +0000)]
am
476398ab: am
0830bb16: Merge "Enable integer overflow sanitization in libinput."
* commit '
476398ab60f4f777b0d7c85986f0185350468d5d':
Enable integer overflow sanitization in libinput.
Michael Wright [Wed, 23 Sep 2015 17:25:00 +0000 (17:25 +0000)]
am
ce92ce9b: Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
* commit '
ce92ce9bef5942435bb49474f0e5e4b29cfc5e97':
DO NOT MERGE Cancel touches as well as pointer gestures.
Dan Austin [Wed, 23 Sep 2015 17:25:00 +0000 (17:25 +0000)]
am
0ba3db9e: am
bffbd09f: Merge "Eliminate multiple benign overflow conditions."
* commit '
0ba3db9e91d683a75af244cccfa62c8778a4c62a':
Eliminate multiple benign overflow conditions.
Sergio Giro [Wed, 23 Sep 2015 17:24:58 +0000 (17:24 +0000)]
am
f1519eeb: am
64b83133: Merge "Remove usage of SharedBuffer"
* commit '
f1519eeb21ee03a956d973545f9f0f742727faaa':
Remove usage of SharedBuffer
Dan Austin [Wed, 23 Sep 2015 17:14:55 +0000 (17:14 +0000)]
am
0830bb16: Merge "Enable integer overflow sanitization in libinput."
* commit '
0830bb169717f920817e66afb18abe2c86d20161':
Enable integer overflow sanitization in libinput.
Dan Austin [Wed, 23 Sep 2015 17:14:53 +0000 (17:14 +0000)]
am
bffbd09f: Merge "Eliminate multiple benign overflow conditions."
* commit '
bffbd09f65d3bc594d844a185d75700e8b4789eb':
Eliminate multiple benign overflow conditions.
Sergio Giro [Wed, 23 Sep 2015 17:14:38 +0000 (17:14 +0000)]
am
64b83133: Merge "Remove usage of SharedBuffer"
* commit '
64b83133d5ec40828a10e57cfbb37c642bb7f510':
Remove usage of SharedBuffer
Michael Wright [Wed, 23 Sep 2015 16:53:27 +0000 (16:53 +0000)]
am
bc16fb98: am
cff01363: Merge commit \'
8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix
* commit '
bc16fb988748f8870ff20afaf806f503ca960a6d':
DO NOT MERGE Revert "am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
Dan Austin [Wed, 23 Sep 2015 16:47:59 +0000 (16:47 +0000)]
Merge "Enable integer overflow sanitization in libinput."
Michael Wright [Wed, 23 Sep 2015 16:44:23 +0000 (16:44 +0000)]
am
cff01363: Merge commit \'
8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix
* commit '
cff01363fcbdae5486287540e1f8917244aaea90':
DO NOT MERGE Revert "am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
Dan Austin [Tue, 22 Sep 2015 21:33:57 +0000 (14:33 -0700)]
Enable integer overflow sanitization in libinput.
Bug:
24171356
Change-Id: I1412b78171c60b0252560956a672f2d92a7011e6
Michael Wright [Wed, 23 Sep 2015 16:36:41 +0000 (17:36 +0100)]
Merge commit '
8a196b5630a93a3eb6df4cbe461917731e54fb35' into merge-fix
Change-Id: Iae99c0f3a13d999f1ff093993008a7c720e99725
Dan Austin [Wed, 23 Sep 2015 16:36:28 +0000 (16:36 +0000)]
Merge "Eliminate multiple benign overflow conditions."
Sergio Giro [Wed, 23 Sep 2015 16:22:55 +0000 (16:22 +0000)]
Merge "Remove usage of SharedBuffer"
Dan Austin [Wed, 23 Sep 2015 15:05:02 +0000 (15:05 +0000)]
am
d37734a4: am
c6a6c6de: am
ad2a1592: Merge "Enable multiple benign overflow conditions."
* commit '
d37734a4871013d067a033914579281bf5d1c13a':
Enable multiple benign overflow conditions.
Dan Austin [Wed, 23 Sep 2015 15:05:01 +0000 (15:05 +0000)]
am
9040362b: am
fc6a2bff: am
146f31b6: Merge "Eliminate benign overflow condition triggered upon loop termination in Input.cpp"
* commit '
9040362b1ec56f077e9bca395939a6669ffa8303':
Eliminate benign overflow condition triggered upon loop termination in Input.cpp
Dan Austin [Wed, 23 Sep 2015 14:58:25 +0000 (14:58 +0000)]
am
c6a6c6de: am
ad2a1592: Merge "Enable multiple benign overflow conditions."
* commit '
c6a6c6de7c43198dc93f92f935ebc120de1050c8':
Enable multiple benign overflow conditions.
Dan Austin [Wed, 23 Sep 2015 14:58:24 +0000 (14:58 +0000)]
am
fc6a2bff: am
146f31b6: Merge "Eliminate benign overflow condition triggered upon loop termination in Input.cpp"
* commit '
fc6a2bff11e342acb3c098bc2be7557e0876efac':
Eliminate benign overflow condition triggered upon loop termination in Input.cpp
Dan Austin [Wed, 23 Sep 2015 14:52:27 +0000 (14:52 +0000)]
am
ad2a1592: Merge "Enable multiple benign overflow conditions."
* commit '
ad2a1592cf01a5393ad645fea81b6c36ee11f73e':
Enable multiple benign overflow conditions.
Dan Austin [Wed, 23 Sep 2015 14:52:26 +0000 (14:52 +0000)]
am
146f31b6: Merge "Eliminate benign overflow condition triggered upon loop termination in Input.cpp"
* commit '
146f31b6c44f557270779106e95c769783270fed':
Eliminate benign overflow condition triggered upon loop termination in Input.cpp
Dan Austin [Wed, 23 Sep 2015 14:45:51 +0000 (14:45 +0000)]
Merge "Enable multiple benign overflow conditions."
Dan Austin [Wed, 23 Sep 2015 14:45:25 +0000 (14:45 +0000)]
Merge "Eliminate benign overflow condition triggered upon loop termination in Input.cpp"
Michael Wright [Wed, 23 Sep 2015 13:18:26 +0000 (13:18 +0000)]
Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
Michael Wright [Wed, 23 Sep 2015 13:15:33 +0000 (13:15 +0000)]
Merge "DO NOT MERGE Revert "am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"" into mnc-dr-dev
Naveen Leekha [Wed, 23 Sep 2015 01:04:44 +0000 (18:04 -0700)]
Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Partial manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest
to automerge from klp-dev)
For b/
23696300
Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
Dan Austin [Tue, 22 Sep 2015 21:28:07 +0000 (14:28 -0700)]
Eliminate multiple benign overflow conditions.
In InputTransport.cpp, there are multiple loops in which loop
termination occurs when the value becomes zero. These termination
conditions are all written value-- > 0, which, since value is
unsigned, result in an unsigned integer overflow when value is 0.
These loops were refactored to eliminate these conditions.
Bug:
24171356
Change-Id: Ie135c4306d1f2cef2778e295242305ed5139221a
Dan Austin [Tue, 22 Sep 2015 21:32:03 +0000 (14:32 -0700)]
Enable multiple benign overflow conditions.
In VelocityTracker.cpp, there are multiple loops in which loop
termination occurs when the value becomes zero. These termination
conditions are all written value-- > 0, which, since value is
unsigned, result in an integer overflow condition when value is 0.
These loop were refactored to eliminate these conditions.
Bug:
24171356
Change-Id: Ie44940cfef8a122ee1aff59c021274ba39a368bf
Dan Austin [Tue, 22 Sep 2015 21:22:41 +0000 (14:22 -0700)]
Eliminate benign overflow condition triggered upon loop termination in Input.cpp
In readFromParcel, a while loop is terminated when sampleCount = 0. The
decrement operation that was here would decrease sampleCount, an unsigned value,
below 0, triggering an unsigned integer overflow. The while loop was refactored
to eliminate this condition.
Bug:
24171356
Change-Id: I7669f54a41d11548b33e322b025431c6f6038952
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
DO NOT MERGE Cancel touches as well as pointer gestures.
Bug:
24302031
Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
Michael Wright [Tue, 22 Sep 2015 20:04:33 +0000 (21:04 +0100)]
DO NOT MERGE Revert "am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
This reverts commit
9b70ab7a3cb260205e81e40ba181a86710d2eb95, reversing
changes made to
153008efb5a00ed3c18d588ce15f90d2442a9786.
Bug:
24302031
Change-Id: Ia746381b30be3b54cb646ed412b7271962c4b02a
Andreas Gampe [Tue, 22 Sep 2015 20:57:52 +0000 (20:57 +0000)]
am
591457b7: am
6263caf7: am
83af0cc2: am
72ebebed: Installd: Take boot status as dexopt parameter
* commit '
591457b71413d5d044c3ab1cd74b954f37d18e2f':
Installd: Take boot status as dexopt parameter
Andreas Gampe [Tue, 22 Sep 2015 18:58:58 +0000 (18:58 +0000)]
am
6263caf7: am
83af0cc2: am
72ebebed: Installd: Take boot status as dexopt parameter
* commit '
6263caf72f343dfbb18e7061c5453f78cfa19e72':
Installd: Take boot status as dexopt parameter
Andreas Gampe [Tue, 22 Sep 2015 18:50:45 +0000 (18:50 +0000)]
am
83af0cc2: am
72ebebed: Installd: Take boot status as dexopt parameter
* commit '
83af0cc22c77c31df1f08d65f29509b6123b6399':
Installd: Take boot status as dexopt parameter
Andreas Gampe [Tue, 22 Sep 2015 18:36:46 +0000 (18:36 +0000)]
am
72ebebed: Installd: Take boot status as dexopt parameter
* commit '
72ebebed876a62e719b098e43d9d516361bde029':
Installd: Take boot status as dexopt parameter
Naveen Leekha [Tue, 22 Sep 2015 18:20:41 +0000 (18:20 +0000)]
Merge "Initialize local variables to avoid data leak"
Pablo Ceballos [Tue, 22 Sep 2015 17:10:21 +0000 (17:10 +0000)]
Merge "BQ: Prevent operations on disconnected BQs"
Naveen Leekha [Tue, 22 Sep 2015 00:28:04 +0000 (17:28 -0700)]
Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
For b/
23696300
Change-Id: Ie37a34851ffe203f9579f63f1fe1b8605a880c30
Nick Kralevich [Mon, 21 Sep 2015 22:37:27 +0000 (22:37 +0000)]
am
8207a7b4: am
96c5d65b: am
251c8b3f: Merge "constify generated JNINativeMethod fn ptr tables"
* commit '
8207a7b4b8086abfb2f768c8cf6da8ecdc16b0aa':
constify generated JNINativeMethod fn ptr tables
Nick Kralevich [Mon, 21 Sep 2015 22:32:01 +0000 (22:32 +0000)]
am
96c5d65b: am
251c8b3f: Merge "constify generated JNINativeMethod fn ptr tables"
* commit '
96c5d65b0bef97c1315ea5d7568df912710383c7':
constify generated JNINativeMethod fn ptr tables
Nick Kralevich [Mon, 21 Sep 2015 22:22:23 +0000 (22:22 +0000)]
am
251c8b3f: Merge "constify generated JNINativeMethod fn ptr tables"
* commit '
251c8b3ff842363243c8eea25b369bd805af7aad':
constify generated JNINativeMethod fn ptr tables
Nick Kralevich [Mon, 21 Sep 2015 21:42:06 +0000 (21:42 +0000)]
Merge "constify generated JNINativeMethod fn ptr tables"
Tom Cherry [Mon, 21 Sep 2015 21:41:48 +0000 (21:41 +0000)]
am
9ec97471: add system-background cpuset
* commit '
9ec97471638fb98f5266826e4242e301e5dffc76':
add system-background cpuset
Tom Cherry [Mon, 21 Sep 2015 21:27:37 +0000 (14:27 -0700)]
add system-background cpuset
add a new cpuset for system services that should not run on
larger cores
bug
24144797
Change-Id: I4f3cd34711b7ffcd2ef45ef2a3cd4642d0ef34c5
Andreas Gampe [Mon, 21 Sep 2015 20:21:30 +0000 (13:21 -0700)]
Installd: Take boot status as dexopt parameter
Expect the boot status explicitly as a parameter so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug:
23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
Tim Kilbourn [Mon, 21 Sep 2015 17:47:41 +0000 (17:47 +0000)]
Merge "Refactor InputHost and InputDriver"
Daniel Micay [Mon, 21 Sep 2015 17:17:57 +0000 (13:17 -0400)]
constify generated JNINativeMethod fn ptr tables
Change-Id: Icbad34e298f6d8e60ef12e9a91200994249fe2f5
Pablo Ceballos [Fri, 11 Sep 2015 21:37:39 +0000 (14:37 -0700)]
Remove usage of SharedBuffer
- Remove getSharedBuffer() from Region
- Don't use SharedBuffer for memory management in HWCLayerVersion1,
instead keep shallow copies of the Regions.
Bug
23962051
(cherry picked from commit
d814cf2a3e3a2fdb73efa80539fe8af0a93da1db)
Change-Id: I8fa17beed57936648c7b4defc9219dff1d5b337f
Colin Cross [Sat, 19 Sep 2015 20:03:39 +0000 (20:03 +0000)]
am
18907025: am
d1ddf299: resolved conflicts for
5b5c81c4 to stage-aosp-master
* commit '
18907025a63030cc5f41c1c19b35593687cc6a3d':
asan: update condition to work with multiple SANITIZE_TARGET values.
Colin Cross [Sat, 19 Sep 2015 19:55:53 +0000 (19:55 +0000)]
am
d1ddf299: resolved conflicts for
5b5c81c4 to stage-aosp-master
* commit '
d1ddf29901aef92e53e420e9937e9a4937569b9d':
asan: update condition to work with multiple SANITIZE_TARGET values.
Evgenii Stepanov [Sat, 19 Sep 2015 19:39:01 +0000 (19:39 +0000)]
am
4ac51de8: am
7944e8ad: With SANITIZE_TARGET, load EGL libs from the instrumented path.
* commit '
4ac51de845d2b93a19b2e08a544d6800862807dd':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Evgenii Stepanov [Sat, 19 Sep 2015 19:30:54 +0000 (19:30 +0000)]
am
7944e8ad: With SANITIZE_TARGET, load EGL libs from the instrumented path.
* commit '
7944e8ad6737309d0f64d180a450eaeebfc9865f':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Colin Cross [Sat, 19 Sep 2015 17:37:05 +0000 (10:37 -0700)]
resolved conflicts for
5b5c81c4 to stage-aosp-master
Change-Id: I0be665105d46cb3b934cb00890822d4dfae18f64
Evgenii Stepanov [Wed, 8 Jul 2015 22:49:52 +0000 (15:49 -0700)]
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Bug:
21785137
Change-Id: Iac56419a9ca776c5704bed44d3f0a1a1edd9d172
(cherry picked from commit
c2466e6f005e9cbeea7764e9d8864fa6bca17633)
Evgenii Stepanov [Fri, 18 Sep 2015 20:23:35 +0000 (20:23 +0000)]
Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
Ivan Krasin [Fri, 18 Sep 2015 19:03:44 +0000 (12:03 -0700)]
asan: update condition to work with multiple SANITIZE_TARGET values.
The goal is to enable SANITIZE_TARGET='address coverage', which
will be used by LLVMFuzzer.
Bug:
22850550
Change-Id: Iaa300aa20798f2e9aa613842b463edf8aeebe3a7
Pablo Ceballos [Fri, 4 Sep 2015 01:23:52 +0000 (18:23 -0700)]
BQ: Prevent operations on disconnected BQs
- Update unit tests to match
Bug
23763412
Change-Id: I77e59bf6b57b328433c3835450455f80a8fa454b
Pablo Ceballos [Fri, 18 Sep 2015 17:40:05 +0000 (17:40 +0000)]
Merge "SF: Improve surface flinger unit tests"
Andreas Gampe [Thu, 17 Sep 2015 22:55:22 +0000 (22:55 +0000)]
am
7b603ff0: am
ebb28d9d: am
c5a6696f: Merge "Installd: Allow different behavior before bootcomplete"
* commit '
7b603ff0736d48225b014c0abbe3a23d16a17e23':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Thu, 17 Sep 2015 22:47:14 +0000 (22:47 +0000)]
am
ebb28d9d: am
c5a6696f: Merge "Installd: Allow different behavior before bootcomplete"
* commit '
ebb28d9d614fb7b25406429c339cd3e0247500f2':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Thu, 17 Sep 2015 22:40:57 +0000 (22:40 +0000)]
am
c5a6696f: Merge "Installd: Allow different behavior before bootcomplete"
* commit '
c5a6696f3e51e253b78baacdec99ed34e79bc3fd':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Thu, 17 Sep 2015 22:36:50 +0000 (22:36 +0000)]
Merge "Installd: Allow different behavior before bootcomplete"
Andreas Gampe [Mon, 14 Sep 2015 23:33:11 +0000 (16:33 -0700)]
Installd: Allow different behavior before bootcomplete
Check dev.bootcomplete in dex2oat(). Use the information for
two changes.
Only switch to the background when we're post bootcomplete.
This will ensure better utilization after upgrades.
Add a second dex2oat-threads property that is used pre
bootcomplete. A separation of these phases allows using less
cores when the device is up, freeing up resources for other
purposes, e.g., avoid jank. The precedence during boot is the
boot property, or the image property if the former doesn't
exist, or the default property as a fallback.
Bug:
23898216
Bug:
24004256
(cherry picked from commit
21948005f0294a64a42932b21a33ae75295dc3d9)
Change-Id: I5063f3fc4b437cbe88c4e94584e01c1c78eccc4d
Andreas Gampe [Thu, 17 Sep 2015 02:54:35 +0000 (02:54 +0000)]
am
f1fa40ba: am
6f3c7877: am
da5b88ad: am
d693fc4c: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
* commit '
f1fa40ba1901e5486663ff2898d2ac0a3ee899e5':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Thu, 17 Sep 2015 02:45:31 +0000 (02:45 +0000)]
am
6f3c7877: am
da5b88ad: am
d693fc4c: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
* commit '
6f3c78771f92f269fb9e44c98f821cdc942474e9':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Thu, 17 Sep 2015 00:00:06 +0000 (00:00 +0000)]
am
da5b88ad: am
d693fc4c: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
* commit '
da5b88adac403bbce0669fe9db531897b8be9e7c':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Wed, 16 Sep 2015 23:51:41 +0000 (23:51 +0000)]
am
d693fc4c: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
* commit '
d693fc4c50873485794d1e0f444547d3253a56d3':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Wed, 16 Sep 2015 23:44:06 +0000 (23:44 +0000)]
Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
Andreas Gampe [Mon, 14 Sep 2015 23:33:11 +0000 (16:33 -0700)]
Installd: Allow different behavior before bootcomplete
Check dev.bootcomplete in dex2oat(). Use the information for
two changes.
Only switch to the background when we're post bootcomplete.
This will ensure better utilization after upgrades.
Add a second dex2oat-threads property that is used pre
bootcomplete. A separation of these phases allows using less
cores when the device is up, freeing up resources for other
purposes, e.g., avoid jank. The precedence during boot is the
boot property, or the image property if the former doesn't
exist, or the default property as a fallback.
Bug:
23898216
Bug:
24004256
Change-Id: I5063f3fc4b437cbe88c4e94584e01c1c78eccc4d