Puneet Kumar
b916390540
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
2015-10-08 09:15:32 +00:00
Puneet Kumar
ec1323dbd4
am 2f3c3eb4
: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
...
* commit '2f3c3eb4e47d7cb6ef67e0fd2063e4b93e38e9ec':
Allow defining replacement key events in keymap
2015-10-08 09:08:31 +00:00
Puneet Kumar
2f3c3eb4e4
Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
2015-10-08 08:16:31 +00:00
Erik Wolsheimer
ddf5f2509b
am 05c86225
: do not dumpstate raft BUG: 24159112
...
* commit '05c862252d5021f55a69281473c67d76e7097422':
do not dumpstate raft BUG: 24159112
2015-10-02 17:37:05 +00:00
Erik Wolsheimer
05c862252d
do not dumpstate raft
...
BUG: 24159112
Change-Id: I344aa73808992b5f84cb0536201a3ab2eb6f2b3c
2015-10-02 10:02:24 -07:00
Andrew de los Reyes
c9b392395f
am 6c51a07d
: am de18f6c3
: InputResampling: Don\'t extrapolate for very low frame rates.
...
* commit '6c51a07d30a3c4bed9675da88c5f6f24a741d9a2':
InputResampling: Don't extrapolate for very low frame rates.
2015-10-02 02:22:46 +00:00
Andrew de los Reyes
6c51a07d30
am de18f6c3
: InputResampling: Don\'t extrapolate for very low frame rates.
...
* commit 'de18f6c32add6fb22065807a00ddc88b363df527':
InputResampling: Don't extrapolate for very low frame rates.
2015-10-02 02:12:59 +00:00
Andrew de los Reyes
de18f6c32a
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
2015-10-01 15:57:25 -07:00
Dmitry Torokhov
115f93eeeb
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
2015-09-29 13:26:30 -07:00
Andreas Gampe
bcf2901af9
am 72da7fb7
: Installd: Fully decouple pre- and post-bootcomplete properties
...
* commit '72da7fb77cc0aaeb272b0359679c841d02d5edfe':
Installd: Fully decouple pre- and post-bootcomplete properties
2015-09-28 22:51:07 +00:00
Andreas Gampe
72da7fb77c
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
2015-09-28 22:12:13 +00:00
Naveen Leekha
bac4a44ac9
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
2015-09-24 23:55:17 +00:00
Naveen Leekha
53aa7d80cf
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
2015-09-24 23:44:56 +00:00
Naveen Leekha
b0127aadaf
am 69412a51
: am c4bd7211
: resolved conflicts for 7534e4e6
to lmp-mr1-ub-dev
...
* commit '69412a51f58fa9450f1cb077c8d4b6410128d993':
resolved conflicts for 7534e4e6
to lmp-mr1-ub-dev
2015-09-24 23:35:41 +00:00
Naveen Leekha
69412a51f5
am c4bd7211
: resolved conflicts for 7534e4e6
to lmp-mr1-ub-dev
...
* commit 'c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
resolved conflicts for 7534e4e6
to lmp-mr1-ub-dev
2015-09-24 23:27:31 +00:00
Naveen Leekha
c4bd721137
resolved conflicts for 7534e4e6
to lmp-mr1-ub-dev
...
Change-Id: I543df164076b44578b14d41031800bb62b81586d
2015-09-24 15:55:21 -07:00
Naveen Leekha
b062a7a10d
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
2015-09-24 22:40:55 +00:00
Naveen Leekha
62e5463e24
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
2015-09-24 22:31:42 +00:00
Naveen Leekha
83e60e4257
am 571e27e2
: am e889592e
: am 73887c08
: am b414255f
: Initialize local variables to avoid data leak
...
* commit '571e27e20e30560985d7c3a3ba8885693695b0fc':
Initialize local variables to avoid data leak
2015-09-24 22:26:22 +00:00
Naveen Leekha
571e27e20e
am e889592e
: am 73887c08
: am b414255f
: Initialize local variables to avoid data leak
...
* commit 'e889592e33891c9b88ff6ba655426118f8ef12ee':
Initialize local variables to avoid data leak
2015-09-24 22:20:59 +00:00
Naveen Leekha
e889592e33
am 73887c08
: am b414255f
: Initialize local variables to avoid data leak
...
* commit '73887c0864c9a928db6f66bd48c5aea4d31d9a8b':
Initialize local variables to avoid data leak
2015-09-24 22:13:06 +00:00
Naveen Leekha
73887c0864
am b414255f
: Initialize local variables to avoid data leak
...
* commit 'b414255f53b560a06e642251535b019327ba0d7b':
Initialize local variables to avoid data leak
2015-09-24 22:00:33 +00:00
Michael Wright
dd71ee89af
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.
2015-09-23 17:49:52 +00:00
Michael Wright
0a77df93cb
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.
2015-09-23 17:25:00 +00:00
Michael Wright
bc16fb9887
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"
2015-09-23 16:44:23 +00:00
Michael Wright
cff01363fc
Merge commit '8a196b5630a93a3eb6df4cbe461917731e54fb35' into merge-fix
...
Change-Id: Iae99c0f3a13d999f1ff093993008a7c720e99725
2015-09-23 17:36:41 +01:00
Michael Wright
ce92ce9bef
Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
2015-09-23 13:18:26 +00:00
Michael Wright
8a196b5630
Merge "DO NOT MERGE Revert "am f37143d8
: Merge "Cancel touches as well as pointer gestures." into mnc-dev"" into mnc-dr-dev
2015-09-23 13:15:33 +00:00
Naveen Leekha
b414255f53
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
2015-09-22 18:04:44 -07:00
Michael Wright
8e81282601
DO NOT MERGE Cancel touches as well as pointer gestures.
...
Bug: 24302031
Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
2015-09-22 22:05:53 +01:00
Michael Wright
a16b98c64f
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
2015-09-22 22:05:48 +01:00
Andreas Gampe
6263caf72f
am 83af0cc2
: am 72ebebed
: Installd: Take boot status as dexopt parameter
...
* commit '83af0cc22c77c31df1f08d65f29509b6123b6399':
Installd: Take boot status as dexopt parameter
2015-09-22 18:50:45 +00:00
Andreas Gampe
83af0cc22c
am 72ebebed
: Installd: Take boot status as dexopt parameter
...
* commit '72ebebed876a62e719b098e43d9d516361bde029':
Installd: Take boot status as dexopt parameter
2015-09-22 18:36:46 +00:00
Andreas Gampe
72ebebed87
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
2015-09-21 13:21:30 -07:00
Andreas Gampe
6f3c78771f
am da5b88ad
: am d693fc4c
: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
...
* commit 'da5b88adac403bbce0669fe9db531897b8be9e7c':
Installd: Allow different behavior before bootcomplete
2015-09-17 00:00:06 +00:00
Andreas Gampe
da5b88adac
am d693fc4c
: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
...
* commit 'd693fc4c50873485794d1e0f444547d3253a56d3':
Installd: Allow different behavior before bootcomplete
2015-09-16 23:51:41 +00:00
Andreas Gampe
d693fc4c50
Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
2015-09-16 23:44:06 +00:00
Andreas Gampe
21948005f0
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
2015-09-16 15:10:55 -07:00
Lorenzo Colitti
a8273f0944
am 872269a5
: am 6afc38c4
: Dump the ND offload status and address table in bugreports.
...
* commit '872269a579e776c61ac5777e70ca2981771117d6':
Dump the ND offload status and address table in bugreports.
2015-09-15 02:55:55 +00:00
Lorenzo Colitti
872269a579
am 6afc38c4
: Dump the ND offload status and address table in bugreports.
...
* commit '6afc38c45af45eb8f64793bca2903b3f4c55579b':
Dump the ND offload status and address table in bugreports.
2015-09-15 02:46:32 +00:00
Lorenzo Colitti
6afc38c45a
Dump the ND offload status and address table in bugreports.
...
Also, move NetworkDiagnostics between the two runs of getting the
wifi counters, so we can see the effect on the counters of
sending our probe packets.
Bug: 23661687
Change-Id: I3f81c003a35f50ac1cb8e77d0a8c73dae4fd91f3
2015-09-09 22:59:25 +09:00
Martijn Coenen
c2874048d0
am 5ca0c2ed
: am 624408ee
: Merge "Map realtime to clock_monotonic." into mnc-dr-dev
...
* commit '5ca0c2ede8a8d3f499dd7d27832713d4ce16d4ba':
Map realtime to clock_monotonic.
2015-09-07 07:38:29 +00:00
Martijn Coenen
5ca0c2ede8
am 624408ee
: Merge "Map realtime to clock_monotonic." into mnc-dr-dev
...
* commit '624408eecb0d278cb1de1bb088699e25b319d15e':
Map realtime to clock_monotonic.
2015-09-07 07:30:19 +00:00
Martijn Coenen
624408eecb
Merge "Map realtime to clock_monotonic." into mnc-dr-dev
2015-09-07 07:25:51 +00:00
Nick Armstrong-Crews
8d13427f6f
am 3c8a147c
: Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev
...
* commit '3c8a147c8394a32217bb65672387d69a49a31270':
Add KEYCODE_SOFT_SLEEP for Ungaze.
2015-09-04 18:16:12 +00:00
Nick Armstrong-Crews
3c8a147c83
Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev
2015-09-04 18:04:11 +00:00
Dan Stoza
e5ce0db833
am f090d598
: am 3e4c8ccc
: Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
...
* commit 'f090d5985a20f13433be632beb45af8a882c0cd0':
SF: Add colorTransform to DisplayInfo
2015-09-03 22:13:25 +00:00
Dan Stoza
f090d5985a
am 3e4c8ccc
: Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
...
* commit '3e4c8ccc3e5d037688ed8a1f8b69764c526e0d2f':
SF: Add colorTransform to DisplayInfo
2015-09-03 22:03:03 +00:00
Dan Stoza
3e4c8ccc3e
Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
2015-09-03 21:55:36 +00:00
Prashant Malani
07da55f933
am 2f7531fb
: am 13c63825
: am e35c7d65
: Add body sensors app op for custom sensors
...
* commit '2f7531fb7a5d0c764c222f5acae0b487578629ab':
Add body sensors app op for custom sensors
2015-09-03 18:26:07 +00:00