OSDN Git Service
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
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)
Lajos Molnar [Fri, 13 Nov 2015 00:16:41 +0000 (00:16 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am:
f1de4547c1 am:
37b8c1f77c
am:
8abb053a2e
* commit '
8abb053a2ea021c649e481813e45860add946e36':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:11:57 +0000 (00:11 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am:
f1de4547c1
am:
37b8c1f77c
* commit '
37b8c1f77cab3ee9809bcbad81d765ec5bddedce':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:07:04 +0000 (00:07 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
am:
f1de4547c1
* commit '
f1de4547c14467c03b00187efde5381dd1fb265c':
OMX: clarify EOS signaling for tunneled decoders
Lajos Molnar [Fri, 13 Nov 2015 00:00:19 +0000 (00:00 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
Peng Xu [Thu, 29 Oct 2015 16:46:18 +0000 (16:46 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev am:
a78c2e65e1
am:
ffb07f645e
* commit '
ffb07f645e12b5c32479bba74b3310353edf691a':
Avoiding flush on-change sensors at subscription
Peng Xu [Tue, 27 Oct 2015 22:31:50 +0000 (22:31 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
am:
a78c2e65e1
* commit '
a78c2e65e13cace4fdbb0295beca5b11de9fde06':
Avoiding flush on-change sensors at subscription
Peng Xu [Tue, 27 Oct 2015 22:23:21 +0000 (22:23 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
Peng Xu [Mon, 26 Oct 2015 22:14:43 +0000 (15:14 -0700)]
Avoiding flush on-change sensors at subscription
Initial sensor flush at subscription is a mechanism to avoid sensors
to get stale samples before subscription happens. However, there is a
slight chance that a most recent sample will be lost during the flush
process. This is OK for continuous sensors but problematic in
on-change sensor as on-change event does not come continuously and
a lost event can cause inconsistent state in client. Flush at
subscription of on-change sensor is disabled in this CL to avoid new
important on-change event to be discarded during the initial flush
process.
Bugs: b/
24647069
b/
25241873
b/
24804819
Change-Id: Ibda099c6b9f5fb6e200f13cf13a850b0026e9e7c
Nick Kralevich [Fri, 23 Oct 2015 21:40:03 +0000 (21:40 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e am:
1d94a1d036 -s ours am:
bce101e79b am:
574145ea31
am:
5ce90247a2
* commit '
5ce90247a20536091505b449a4d386c21034d842':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 21:35:13 +0000 (21:35 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e am:
1d94a1d036 -s ours am:
bce101e79b
am:
574145ea31
* commit '
574145ea31171a80c45f86eb231f55a2106826c4':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 21:22:14 +0000 (21:22 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e am:
1d94a1d036 -s ours
am:
bce101e79b
* commit '
bce101e79b5ee9715a8329db8fd760f7ba829de1':
DO NOT MERGE: fix build try #2
Adrian Roos [Fri, 23 Oct 2015 17:32:40 +0000 (17:32 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am:
cf33d50d25
am:
0c11f9918c
* commit '
0c11f9918c6f834f12d97315ef0247c08f8fef63':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Fri, 23 Oct 2015 17:28:42 +0000 (17:28 +0000)]
Merge changes from topic \'parcel-v2\' into mnc-dr-dev
am:
cf33d50d25
* commit '
cf33d50d25c5660bf1d4325c11433fb281bc31cb':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Fri, 23 Oct 2015 17:21:23 +0000 (17:21 +0000)]
Merge changes from topic 'parcel-v2' into mnc-dr-dev
* changes:
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Nick Kralevich [Fri, 23 Oct 2015 04:36:16 +0000 (04:36 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e
am:
1d94a1d036 -s ours
* commit '
1d94a1d036cb4bc8d9b178f56fa3bbddc81b7f10':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 04:32:47 +0000 (04:32 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours
am:
a2685ebb1e
* commit '
a2685ebb1ec5ed523fb4800d2593f2ae0c10ed22':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 04:26:07 +0000 (04:26 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e am:
0370a03b6e am:
18e7c64ea8
am:
6eac97d4ba
* commit '
6eac97d4baf77954c7d862e7bf35ed3763543491':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours
am:
dbc9a47831 -s ours
* commit '
dbc9a478311e8728c8148a80abb103fca697891d':
DO NOT MERGE: fix build try #2
Flanker [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7 am:
711c7becb0
am:
928a4879e4
* commit '
928a4879e4a2b996bccf007d390f7f2719e9a901':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:23:35 +0000 (04:23 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e am:
0370a03b6e
am:
18e7c64ea8
* commit '
18e7c64ea82e002978ef069884d195e02e7302df':
DO NOT MERGE: fix build breakage
Flanker [Fri, 23 Oct 2015 04:23:24 +0000 (04:23 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6 am:
a82ace99f7
am:
711c7becb0
* commit '
711c7becb01eec79d8335f335fab6e00a9164b00':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:19:58 +0000 (04:19 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f am:
1b28b05d2e
am:
0370a03b6e
* commit '
0370a03b6e74e40d5110b83fed2243bf072aee73':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902
am:
034bc1799c -s ours
* commit '
034bc1799cbbc4184aa507eba181573c0a3b9b35':
DO NOT MERGE: fix build try #2
Flanker [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825 am:
9830f11dc6
am:
a82ace99f7
* commit '
a82ace99f76ed815e16ab64eae2e9e55871a8b8f':
add number constraint for samples per MotionEvent
Nick Kralevich [Fri, 23 Oct 2015 04:15:24 +0000 (04:15 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f
am:
1b28b05d2e
* commit '
1b28b05d2edf11f49717b53cd49a9161892f0388':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 04:15:21 +0000 (04:15 +0000)]
DO NOT MERGE: fix build try #2
am:
778b6f4902
* commit '
778b6f4902ad824d5fc62071caaa837bb47deee5':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 02:02:42 +0000 (02:02 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7
am:
9ec978732f
* commit '
9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:52:34 +0000 (01:52 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65
am:
fa632f6ad7
* commit '
fa632f6ad7be6b1f488dd3d1b825a82456db5097':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:44:26 +0000 (01:44 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
am:
7f1ea80d65
* commit '
7f1ea80d65996ab687ff56a884da915535cdc176':
DO NOT MERGE: fix build breakage
Adrian Roos [Thu, 22 Oct 2015 23:46:12 +0000 (16:46 -0700)]
Maintain Parcel ABI
Makes sure we don't change the memory layout of the Parcel class
to maintain binary compatibility with prebuilts linking against
libbinder.
Bug:
25004154
Change-Id: I656687497f08bb85cefda796aafa2341e601e30a
Adrian Roos [Thu, 22 Oct 2015 23:12:53 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit
6880307e8e35a6c484942443fb4ddd6173126152.
Bug:
25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
Nick Kralevich [Fri, 23 Oct 2015 00:26:19 +0000 (17:26 -0700)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
Bug:
23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
Ian Pedowitz [Thu, 22 Oct 2015 22:33:58 +0000 (22:33 +0000)]
Revert "Track ashmem memory usage in Parcel" am:
6880307e8e
am:
159a5c3372
* commit '
159a5c337250613c166ae45b2811861f70c733bd':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:32:07 +0000 (22:32 +0000)]
Revert "Track ashmem memory usage in Parcel"
am:
6880307e8e
* commit '
6880307e8e35a6c484942443fb4ddd6173126152':
Revert "Track ashmem memory usage in Parcel"
Flanker [Thu, 22 Oct 2015 22:28:01 +0000 (22:28 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825
am:
9830f11dc6
* commit '
9830f11dc6b6aa4001c79147966fdb9eaa71c2f2':
add number constraint for samples per MotionEvent
Ian Pedowitz [Thu, 22 Oct 2015 22:08:10 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"
This reverts commit
e2f499fb734bc30a1e1c947112caa0727349b6ed.
Bug:
25169267
Bug:
25191602
Bug:
25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0
Nick Kralevich [Thu, 22 Oct 2015 21:48:50 +0000 (14:48 -0700)]
DO NOT MERGE: fix build try #2
On klp-dev, UINT16_MAX isn't available unless __STDINT_LIMITS
is defined, which it's not for this code. This isn't relevant
for later branches due to bionic commit
e2a292d278b94fec3d078b1f1b27c1f89942c276
Don't use UINT16_MAX when we can just hardcode 65535.
Bug:
23905002
Change-Id: Ia1fd0f749cb7a4d19866075abc28ed6960424e54
Nick Kralevich [Thu, 22 Oct 2015 14:09:23 +0000 (07:09 -0700)]
DO NOT MERGE: fix build breakage
fix klp-dev only build breakage.
frameworks/native/libs/input/Input.cpp: In member function 'android::status_t android::MotionEvent::readFromParcel(android::Parcel*)':
frameworks/native/libs/input/Input.cpp:494:47: error: 'UINT16_MAX' was not declared in this scope
Bug:
23905002
Change-Id: I4b6b864ca64d39a8873d045a61e0ddaea2ab9109
Flanker [Thu, 22 Oct 2015 02:15:13 +0000 (02:15 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869
am:
90dc6dc825
* commit '
90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:10:12 +0000 (02:10 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01
am:
9964d83869
* commit '
9964d83869565cf4dda432129cfe50f6ede19338':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:04:55 +0000 (02:04 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade
am:
72c8ca4a01
* commit '
72c8ca4a0191827fd3265c0820b685a6cf420be1':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:02:46 +0000 (02:02 +0000)]
add number constraint for samples per MotionEvent
am:
5d17838ade
* commit '
5d17838adef13062717322e79d4db0b9bb6b2395':
add number constraint for samples per MotionEvent
Adrian Roos [Thu, 22 Oct 2015 00:52:32 +0000 (00:52 +0000)]
Track ashmem memory usage in Parcel am:
e2f499fb73
am:
a0c1be2617
* commit '
a0c1be26177d554ef9c5d61b8a564bb03d402a04':
Track ashmem memory usage in Parcel
Adrian Roos [Thu, 22 Oct 2015 00:49:15 +0000 (00:49 +0000)]
Track ashmem memory usage in Parcel
am:
e2f499fb73
* commit '
e2f499fb734bc30a1e1c947112caa0727349b6ed':
Track ashmem memory usage in Parcel
Adrian Roos [Wed, 21 Oct 2015 02:11:23 +0000 (19:11 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
(cherry picked from commit
552a8a5d8df32f659b8d11311a244cdc6d3b7733)
Change-Id: I9b7ea859889b7697bee4165a2746602212120543
Naveen Leekha [Tue, 20 Oct 2015 17:48:10 +0000 (17:48 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606 am:
8121177b5e am:
7135d2768b
am:
5957172a7e
* commit '
5957172a7edb83d05423d5abae0091628f0c557c':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 17:25:55 +0000 (17:25 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606 am:
8121177b5e
am:
7135d2768b
* commit '
7135d2768bcb46603735ab9b6b4bbaa788d39179':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 17:02:33 +0000 (17:02 +0000)]
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
Naveen Leekha [Tue, 20 Oct 2015 16:54:09 +0000 (16:54 +0000)]
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
Naveen Leekha [Tue, 20 Oct 2015 16:42:34 +0000 (16:42 +0000)]
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
Aravind Akella [Wed, 14 Oct 2015 21:13:41 +0000 (21:13 +0000)]
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.
Aravind Akella [Wed, 14 Oct 2015 21:08:15 +0000 (21:08 +0000)]
am
2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '
2ac7405bda4f621f07cbcc0b562d16f7a9611c7b':
Set DATA_INJECTION mode flag for sensors.
Aravind Akella [Wed, 14 Oct 2015 21:03:07 +0000 (21:03 +0000)]
Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
Jesse Hall [Wed, 14 Oct 2015 20:26:57 +0000 (20:26 +0000)]
am
a518d5ad: am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
a518d5ad0c0c6a661471a8cd2c962612943ca667':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 20:14:55 +0000 (20:14 +0000)]
am
312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '
312d7555cb71ce7fb73bc758b9e30653e223b2f3':
egl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 18:10:24 +0000 (11:10 -0700)]
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
Adam Lesinski [Mon, 12 Oct 2015 22:30:10 +0000 (22:30 +0000)]
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
Adam Lesinski [Mon, 12 Oct 2015 22:23:05 +0000 (22:23 +0000)]
am
16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '
16b0ae105e4e94ff09d1517b68f7c66f2022a19e':
add number constraint for samples per MotionEvent
Adam Lesinski [Mon, 12 Oct 2015 22:15:50 +0000 (22:15 +0000)]
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
Jason Parks [Mon, 12 Oct 2015 15:39:58 +0000 (15:39 +0000)]
am
33c3c1bd: Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
* commit '
33c3c1bd71de8a903b6a07f0b1c4f2f670313778':
Revert "do not dumpstate raft BUG:
24159112"
Jason Parks [Mon, 12 Oct 2015 15:34:47 +0000 (15:34 +0000)]
Merge "Revert "do not dumpstate raft BUG:
24159112"" into cw-e-dev
Jason Parks [Mon, 12 Oct 2015 15:27:10 +0000 (15:27 +0000)]
Revert "do not dumpstate raft BUG:
24159112"
This reverts commit
05c862252d5021f55a69281473c67d76e7097422.
Change-Id: Ib5984796734d2a0e33f47e0fb4e446b787e0d14f
Puneet Kumar [Thu, 8 Oct 2015 09:15:33 +0000 (09:15 +0000)]
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
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:32 +0000 (09:08 +0000)]
am
a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit '
a2f78b44ee30839e2c047d07525dd6bc4fe50f1d':
Inputflinger: hook up key event replacement processing
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:58 +0000 (08:16 +0000)]
Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
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
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 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
Dmitry Torokhov [Thu, 24 Sep 2015 20:13:55 +0000 (13:13 -0700)]
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
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 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
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: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:20:05 +0000 (22:20 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
18165848e86feab8656bfdac3173bccf45a9a6df':
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:04:48 +0000 (22:04 +0000)]
am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
e2c4f4fb8b34e36a4f2760f3812c942604cabfb6':
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
Naveen Leekha [Thu, 24 Sep 2015 22:00:13 +0000 (22:00 +0000)]
am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4':
Initialize local variables to avoid data leak
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.
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.
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"
OSDN Git Service
