OSDN Git Service
Dmitry Torokhov [Thu, 8 Oct 2015 16:36:47 +0000 (09:36 -0700)]
resolved conflicts for
b9163905 to mnc-dr-dev-plus-aosp
Change-Id: I83afd79491533b1c7ae2aed50a927db175ba555f
Puneet Kumar [Thu, 8 Oct 2015 09:15:32 +0000 (09:15 +0000)]
am
ec1323db: am
2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
* commit '
ec1323dbd4558f9d4ff422c8547334fe13242ad0':
Allow defining replacement key events in keymap
Puneet Kumar [Thu, 8 Oct 2015 09:08:31 +0000 (09:08 +0000)]
am
2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
* commit '
2f3c3eb4e47d7cb6ef67e0fd2063e4b93e38e9ec':
Allow defining replacement key events in keymap
Puneet Kumar [Thu, 8 Oct 2015 08:16:31 +0000 (08:16 +0000)]
Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
Nick Kralevich [Thu, 8 Oct 2015 00:19:53 +0000 (00:19 +0000)]
am
ae0405d6: Merge "dumpstate: execute procrank using su"
* commit '
ae0405d607f9ed08d708ee990716a7881a6cfd4d':
dumpstate: execute procrank using su
Nick Kralevich [Thu, 8 Oct 2015 00:08:35 +0000 (00:08 +0000)]
Merge "dumpstate: execute procrank using su"
Nick Kralevich [Wed, 7 Oct 2015 23:38:42 +0000 (16:38 -0700)]
dumpstate: execute procrank using su
procrank is a setuid binary which only exists on userdebug/eng
builds. Instead of executing the setuid binary, run the binary using
the su command. This eliminates one more setuid binary, and allows
the tightening of the SELinux policy.
Bug:
18342188
Change-Id: I81d06196a29489feaefb2fea0cf5c4ff1e273d2f
Erik Wolsheimer [Fri, 2 Oct 2015 17:43:26 +0000 (17:43 +0000)]
am
ddf5f250: am
05c86225: do not dumpstate raft BUG:
24159112
* commit '
ddf5f2509b48ee85dc352ee245f34a9d6307be39':
do not dumpstate raft BUG:
24159112
Erik Wolsheimer [Fri, 2 Oct 2015 17:37:05 +0000 (17:37 +0000)]
am
05c86225: do not dumpstate raft BUG:
24159112
* commit '
05c862252d5021f55a69281473c67d76e7097422':
do not dumpstate raft BUG:
24159112
Erik Wolsheimer [Fri, 2 Oct 2015 17:02:24 +0000 (10:02 -0700)]
do not dumpstate raft
BUG:
24159112
Change-Id: I344aa73808992b5f84cb0536201a3ab2eb6f2b3c
Andrew de los Reyes [Fri, 2 Oct 2015 08:26:24 +0000 (08:26 +0000)]
am
c9b39239: am
6c51a07d: am
de18f6c3: InputResampling: Don\'t extrapolate for very low frame rates.
* commit '
c9b392395f3eada767cf9d1dce1eb40930ca1b95':
InputResampling: Don't extrapolate for very low frame rates.
Andrew de los Reyes [Fri, 2 Oct 2015 02:22:46 +0000 (02:22 +0000)]
am
6c51a07d: am
de18f6c3: InputResampling: Don\'t extrapolate for very low frame rates.
* commit '
6c51a07d30a3c4bed9675da88c5f6f24a741d9a2':
InputResampling: Don't extrapolate for very low frame rates.
Andrew de los Reyes [Fri, 2 Oct 2015 02:12:59 +0000 (02:12 +0000)]
am
de18f6c3: InputResampling: Don\'t extrapolate for very low frame rates.
* commit '
de18f6c32add6fb22065807a00ddc88b363df527':
InputResampling: Don't extrapolate for very low frame rates.
Andrew de los Reyes [Thu, 1 Oct 2015 22:57:25 +0000 (15:57 -0700)]
InputResampling: Don't extrapolate for very low frame rates.
In very low framerate situations, extrapolation is generally going to
either cause no benefit or make a mistake. We can safely turn it off
with no user-visible negative impact.
BUG=https://buganizer.corp.google.com/u/0/issues/
24550942
TEST=Scrolled very slowly and saw mispredictions on Angler. With change,
saw the log message that the mispredictions were suppressed.
Change-Id: Ic9747d3ff098d7918047ada2ed1c2d21282c65b0
Daniel Erat [Wed, 30 Sep 2015 21:33:29 +0000 (21:33 +0000)]
am
caf1bb7f: am
bd55551d: Merge "Add more methods to IPowerManager."
* commit '
caf1bb7f2bcfc9183208a360e51f9d54268265b0':
Add more methods to IPowerManager.
Daniel Erat [Wed, 30 Sep 2015 21:26:39 +0000 (21:26 +0000)]
am
bd55551d: Merge "Add more methods to IPowerManager."
* commit '
bd55551d80832f62931ccb2d54d9a239822eeb20':
Add more methods to IPowerManager.
Daniel Erat [Wed, 30 Sep 2015 21:21:23 +0000 (21:21 +0000)]
Merge "Add more methods to IPowerManager."
Daniel Erat [Wed, 30 Sep 2015 20:49:15 +0000 (14:49 -0600)]
Add more methods to IPowerManager.
Add the full list of transaction IDs from IPowerManager.aidl
to IPowerManager.h and make BpPowerManager support calling
goToSleep, reboot, shutdown, and crash. These are currently
needed by or likely to be needed by Brillo.
Bug:
22122485
Change-Id: I19abd3587c9d53b28ec150210e07f97517ee4ff4
Sergio Giro [Wed, 30 Sep 2015 20:16:55 +0000 (20:16 +0000)]
am
b450d9d8: am
77f147ff: Merge "frameworks/native: remove superfluous mention of SharedBuffer in Region.h"
* commit '
b450d9d8940f7406def0b1ccd7c139bb7203115f':
frameworks/native: remove superfluous mention of SharedBuffer in Region.h
Sergio Giro [Wed, 30 Sep 2015 20:10:52 +0000 (20:10 +0000)]
am
77f147ff: Merge "frameworks/native: remove superfluous mention of SharedBuffer in Region.h"
* commit '
77f147ff566d350dc23c3a9807ea1262f056ff2f':
frameworks/native: remove superfluous mention of SharedBuffer in Region.h
Sergio Giro [Wed, 30 Sep 2015 14:16:23 +0000 (14:16 +0000)]
Merge "frameworks/native: remove superfluous mention of SharedBuffer in Region.h"
Sergio Giro [Wed, 30 Sep 2015 14:13:52 +0000 (15:13 +0100)]
frameworks/native: remove superfluous mention of SharedBuffer in Region.h
Towards deprecation of SharedBuffer
Change-Id: I9c853c86fb057280013405cb8c3c725e13175ea4
Dmitry Torokhov [Fri, 18 Sep 2015 01:04:50 +0000 (18:04 -0700)]
Allow defining replacement key events in keymap
Currently keyboard maps allow to assign character sequences to key
events and allow specifying a so-called "fallback" key events that are
re-injected into input stream if target application indicates that it
was not able to handle the original key event. Unfortunately there is no
way to perform substitution before handing the event to applicationis.
This change adds a new keymap keyword "replace" that allows users query
"replacement" actions for key (if any), with the intent that such
replacement happens early in the event handling process.
Bug:
24504154
Change-Id: I3e6a2476c856524171df00ad22ff56f2018c1278
Andreas Gampe [Mon, 28 Sep 2015 23:00:58 +0000 (23:00 +0000)]
am
bcf2901a: am
72da7fb7: Installd: Fully decouple pre- and post-bootcomplete properties
* commit '
bcf2901af9f5737f510b968ba9dda5ba58b86f8a':
Installd: Fully decouple pre- and post-bootcomplete properties
Andreas Gampe [Mon, 28 Sep 2015 22:51:07 +0000 (22:51 +0000)]
am
72da7fb7: Installd: Fully decouple pre- and post-bootcomplete properties
* commit '
72da7fb77cc0aaeb272b0359679c841d02d5edfe':
Installd: Fully decouple pre- and post-bootcomplete properties
Andreas Gampe [Mon, 28 Sep 2015 15:55:01 +0000 (08:55 -0700)]
Installd: Fully decouple pre- and post-bootcomplete properties
Do not fall back to dalvik.vm.dex2oat-threads if
dalvik.vm.boot-dex2oat-threads is not set. Also do not ever use
the value of dalvik.vm.image-dex2oat-threads. Instead use the
default behavior of dex2oat in that situation.
(cherry picked from commit
919461cbeef3e9f35388fc099a5fcdae1cb79cc6)
Bug:
24413760
Change-Id: I42e60996341414b95b8df2d243d5e07f7f5ff9b6
Andreas Gampe [Mon, 28 Sep 2015 18:47:20 +0000 (18:47 +0000)]
am
54412fe2: am
28b1d678: Merge "Installd: Fully decouple pre- and post-bootcomplete properties"
* commit '
54412fe2ae0fb5a9dc81b999d726b5a909de3bd7':
Installd: Fully decouple pre- and post-bootcomplete properties
Andreas Gampe [Mon, 28 Sep 2015 18:41:31 +0000 (18:41 +0000)]
am
28b1d678: Merge "Installd: Fully decouple pre- and post-bootcomplete properties"
* commit '
28b1d678a4721e9f02b7b9498492fb3d623f21be':
Installd: Fully decouple pre- and post-bootcomplete properties
Andreas Gampe [Mon, 28 Sep 2015 18:33:59 +0000 (18:33 +0000)]
Merge "Installd: Fully decouple pre- and post-bootcomplete properties"
Todd Kennedy [Mon, 28 Sep 2015 18:33:54 +0000 (18:33 +0000)]
am
534a49dc: am
905c1446: Merge "Allow using the JIT"
* commit '
534a49dc3282d1056f92c7ed6e0ef7fa2f9ec74e':
Allow using the JIT
Andreas Gampe [Mon, 28 Sep 2015 15:55:01 +0000 (08:55 -0700)]
Installd: Fully decouple pre- and post-bootcomplete properties
Do not fall back to dalvik.vm.dex2oat-threads if
dalvik.vm.boot-dex2oat-threads is not set. Also do not ever use
the value of dalvik.vm.image-dex2oat-threads. Instead use the
default behavior of dex2oat in that situation.
Change-Id: I42e60996341414b95b8df2d243d5e07f7f5ff9b6
Todd Kennedy [Mon, 28 Sep 2015 18:23:42 +0000 (18:23 +0000)]
am
905c1446: Merge "Allow using the JIT"
* commit '
905c1446ea602b4649a248bfe878626cae01a87a':
Allow using the JIT
Todd Kennedy [Mon, 28 Sep 2015 17:46:59 +0000 (17:46 +0000)]
Merge "Allow using the JIT"
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.
Change-Id: Id3c5ae227ed400e489bb723a56c516dfc12acd89
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: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: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 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
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 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 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
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: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
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 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: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."