Naveen Leekha
7135d2768b
am 18165848
: am e2c4f4fb
: am c1e6fbb5
: Initialize local variables to avoid data leak am: 7534e4e63a
-s ours am: 7b4863f606
...
am: 8121177b5e
* commit '8121177b5e8c406570f0eaf6593c6fd1db232ddf':
Initialize local variables to avoid data leak
2015-10-20 17:02:33 +00:00
Naveen Leekha
8121177b5e
am 18165848
: am e2c4f4fb
: am c1e6fbb5
: Initialize local variables to avoid data leak am: 7534e4e63a
-s ours
...
am: 7b4863f606
* commit '7b4863f606bdb48b188b0235447dfaba6c8c3cf0':
Initialize local variables to avoid data leak
2015-10-20 16:54:09 +00:00
Naveen Leekha
7b4863f606
am 18165848
: am e2c4f4fb
: am c1e6fbb5
: Initialize local variables to avoid data leak
...
am: 7534e4e63a
-s ours
* commit '7534e4e63afedeb826a8d8a4b0cf3f9d40d243ea':
Initialize local variables to avoid data leak
2015-10-20 16:42:34 +00:00
Aravind Akella
263b020b6e
am 6427e719
: am 2ac7405b
: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
...
* commit '6427e7190bbd83a29169e6ae4b5e3cff263f6937':
Set DATA_INJECTION mode flag for sensors.
2015-10-14 21:13:41 +00:00
Aravind Akella
6427e7190b
am 2ac7405b
: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
...
* commit '2ac7405bda4f621f07cbcc0b562d16f7a9611c7b':
Set DATA_INJECTION mode flag for sensors.
2015-10-14 21:08:15 +00:00
Aravind Akella
2ac7405bda
Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
2015-10-14 21:03:07 +00:00
Jesse Hall
0983618f0a
am a518d5ad
: am 312d7555
: egl: Remove window disconnect before calling driver eglDestroySurface
...
* commit 'a518d5ad0c0c6a661471a8cd2c962612943ca667':
egl: Remove window disconnect before calling driver eglDestroySurface
2015-10-14 20:26:57 +00:00
Jesse Hall
a518d5ad0c
am 312d7555
: egl: Remove window disconnect before calling driver eglDestroySurface
...
* commit '312d7555cb71ce7fb73bc758b9e30653e223b2f3':
egl: Remove window disconnect before calling driver eglDestroySurface
2015-10-14 20:14:55 +00:00
Jesse Hall
312d7555cb
egl: Remove window disconnect before calling driver eglDestroySurface
...
This was originally added for b/14445579. An in-development app was
attempting to render to a window as an EGLSurface, then tear that
down, change some window properties, and create a new EGLSurface. The
second eglCreateWindowSurface failed because the window was already
connected. This change went in, but it turned out the real problem was
that the app still (unintentionally) had the surface current. After
the app bug was fixed, nobody revisited whether this change was
actually needed.
Turns out it wasn't needed. After an EGLSurface is both destroyed
*AND* not current (basically refcount==0), we were already
disconnecting the window in ~egl_surface_t().
Apart from being unnecessary and redundant, disconnecting the window
here is wrong for two reasons:
(a) The surface may still be in use after eglDestroySurface, if it was
still current. Rendering is undefined in that case, but disconnecting
the window leads to more catastrophic results than necessary.
(b) It's being called before calling the driver's eglDestroySurface.
The driver will almost definitely have a buffer dequeued that it needs
to cancel, and by disconnecting first we turn that into an error that
they don't have a graceful way to deal with.
Bug: 24524053
Change-Id: Ib063134413d25d3526f794aafb5e333e3417ea42
2015-10-14 11:21:25 -07:00
Adam Lesinski
5bba4236a8
am 76fc5f18
: am 16b0ae10
: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
...
* commit '76fc5f18e6a0271a1f04db54924653faac73912e':
add number constraint for samples per MotionEvent
2015-10-12 22:30:10 +00:00
Adam Lesinski
76fc5f18e6
am 16b0ae10
: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
...
* commit '16b0ae105e4e94ff09d1517b68f7c66f2022a19e':
add number constraint for samples per MotionEvent
2015-10-12 22:23:05 +00:00
Adam Lesinski
16b0ae105e
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
2015-10-12 22:15:50 +00:00
Flanker
552a8a5d8d
add number constraint for samples per MotionEvent
...
Bug:23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
2015-10-12 11:22:37 -07:00
Jason Parks
7b2b968db4
am 33c3c1bd
: Merge "Revert "do not dumpstate raft BUG: 24159112"" into cw-e-dev
...
* commit '33c3c1bd71de8a903b6a07f0b1c4f2f670313778':
Revert "do not dumpstate raft BUG: 24159112"
2015-10-12 15:39:58 +00:00
Jason Parks
33c3c1bd71
Merge "Revert "do not dumpstate raft BUG: 24159112"" into cw-e-dev
2015-10-12 15:34:47 +00:00
Jason Parks
31baf8d3c2
Revert "do not dumpstate raft BUG: 24159112"
...
This reverts commit 05c862252d
.
Change-Id: Ib5984796734d2a0e33f47e0fb4e446b787e0d14f
2015-10-12 15:27:10 +00:00
Puneet Kumar
98d740d7d2
am 94973aeb
: am a2f78b44
: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
...
* commit '94973aeb1961c5a07a5288ec56c7f79ab658bb8d':
Inputflinger: hook up key event replacement processing
2015-10-08 09:15:33 +00:00
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
94973aeb19
am a2f78b44
: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
...
* commit 'a2f78b44ee30839e2c047d07525dd6bc4fe50f1d':
Inputflinger: hook up key event replacement processing
2015-10-08 09:08: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
a2f78b44ee
Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
2015-10-08 08:16:58 +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
0faaa0bd7a
Inputflinger: hook up key event replacement processing
...
Add handling of "replacement" key events in InputReader and EventHub by
consulting device's character key map (if exists) for presence of
replacement key code for given get code and meta state combination,
before passing it to InputDispatcher.
This enables defining special keys, such as ESC, on keyboards lacking
enough physical keys, via combination of normal keys and modifiers, for
example AltR + 1 => ESC.
Bug: 24504154
Change-Id: I7e36104808bedcf724436c1fbb63d37c35cca8af
2015-09-29 13:27:16 -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
7534e4e63a
am 18165848
: am e2c4f4fb
: am c1e6fbb5
: Initialize local variables to avoid data leak
...
* commit '18165848e86feab8656bfdac3173bccf45a9a6df':
Initialize local variables to avoid data leak
2015-09-24 22:20:05 +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
18165848e8
am e2c4f4fb
: am c1e6fbb5
: Initialize local variables to avoid data leak
...
* commit 'e2c4f4fb8b34e36a4f2760f3812c942604cabfb6':
Initialize local variables to avoid data leak
2015-09-24 22:04:48 +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
Naveen Leekha
e2c4f4fb8b
am c1e6fbb5
: Initialize local variables to avoid data leak
...
* commit 'c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4':
Initialize local variables to avoid data leak
2015-09-24 22:00:13 +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