OSDN Git Service
Jim Miller [Fri, 24 Jul 2015 06:11:23 +0000 (06:11 +0000)]
am
05209372: am
b71eca07: am
5f87f0b4: am
40481a71: am
bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
05209372157aa6183bef3f1f0268cec100085a70':
Add FEATURE_FINGERPRINT to PackageManager's feature list
Chenjie Luo [Fri, 24 Jul 2015 06:11:22 +0000 (06:11 +0000)]
am
8f49ea8d: am
f369a4fc: am
24c8f4b1: am
177a4166: am
99426810: Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
* commit '
8f49ea8dfb786dfd777c93cbd7fcd8ede3d4037e':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Jim Miller [Fri, 24 Jul 2015 04:08:51 +0000 (04:08 +0000)]
am
b71eca07: am
5f87f0b4: am
40481a71: am
bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
b71eca07d07f80656efcfa673a89feab821c857b':
Add FEATURE_FINGERPRINT to PackageManager's feature list
Chenjie Luo [Fri, 24 Jul 2015 04:08:50 +0000 (04:08 +0000)]
am
f369a4fc: am
24c8f4b1: am
177a4166: am
99426810: Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
* commit '
f369a4fc100c4ba4e91e52fa078435518e3e36f7':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Jim Miller [Fri, 24 Jul 2015 03:41:23 +0000 (03:41 +0000)]
am
5f87f0b4: am
40481a71: am
bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
5f87f0b4b76039039affc521896d02c915d53e36':
Add FEATURE_FINGERPRINT to PackageManager's feature list
Chenjie Luo [Fri, 24 Jul 2015 03:41:22 +0000 (03:41 +0000)]
am
24c8f4b1: am
177a4166: am
99426810: Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
* commit '
24c8f4b1569a925e8c421414389f84d0035eaad9':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Jim Miller [Fri, 24 Jul 2015 03:22:52 +0000 (03:22 +0000)]
am
40481a71: am
bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
40481a7126095606865f6b4c172e1f8d9cbf22f3':
Add FEATURE_FINGERPRINT to PackageManager's feature list
Chenjie Luo [Fri, 24 Jul 2015 03:02:43 +0000 (03:02 +0000)]
am
177a4166: am
99426810: Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
* commit '
177a4166252afddbe03a5ed7b2e56b0f9173ef81':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Jim Miller [Fri, 24 Jul 2015 02:53:59 +0000 (02:53 +0000)]
am
bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
bf7cd01ab0fce5c76364f78e3b9fdba078c197c0':
Add FEATURE_FINGERPRINT to PackageManager's feature list
Jim Miller [Fri, 24 Jul 2015 02:41:02 +0000 (02:41 +0000)]
Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev
Jim Miller [Thu, 23 Jul 2015 02:56:05 +0000 (19:56 -0700)]
Add FEATURE_FINGERPRINT to PackageManager's feature list
Fixes bug
22674557
Change-Id: I2ced132c1cb4f4b5166f9af288dd3e697fdcf92b
Michael Wright [Thu, 23 Jul 2015 20:27:01 +0000 (20:27 +0000)]
am
dd28d991: (-s ours) am
ad0db31c: am
9202e49d: am
5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev
* commit '
dd28d991f20c2c24b698006ba4e5750a0629057f':
DO NOT MERGE. Cancel touches as well as pointer gestures.
Michael Wright [Thu, 23 Jul 2015 20:09:44 +0000 (20:09 +0000)]
am
ad0db31c: am
9202e49d: am
5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev
* commit '
ad0db31c695b45a9ba18ff653ce59b40ae36756a':
DO NOT MERGE. Cancel touches as well as pointer gestures.
Michael Wright [Thu, 23 Jul 2015 19:46:18 +0000 (19:46 +0000)]
am
9202e49d: am
5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev
* commit '
9202e49dc9adb03e0b2541011b511bd17c29c0cb':
DO NOT MERGE. Cancel touches as well as pointer gestures.
Michael Wright [Thu, 23 Jul 2015 19:21:23 +0000 (19:21 +0000)]
am
5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev
* commit '
5ea7ea44a23d0ab81f24eb290840db10d766b122':
DO NOT MERGE. Cancel touches as well as pointer gestures.
Michael Wright [Thu, 23 Jul 2015 16:32:02 +0000 (16:32 +0000)]
Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev
Chenjie Luo [Wed, 22 Jul 2015 20:23:43 +0000 (20:23 +0000)]
am
99426810: Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
* commit '
99426810e4828719be84a0f8c186161578512e93':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Aravind Akella [Wed, 22 Jul 2015 18:18:56 +0000 (18:18 +0000)]
am
b4a8ec9f: (-s ours) am
5a02de8b: am
74294808: am
e6406e35: (-s ours) Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE
* commit '
b4a8ec9f3dc3b4a73ee35a900d5646cfc35b8b91':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE
Aravind Akella [Wed, 22 Jul 2015 18:05:10 +0000 (18:05 +0000)]
am
5a02de8b: am
74294808: am
e6406e35: (-s ours) Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE
* commit '
5a02de8bcca99ba5edd710eca921ad0317fe54c1':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE
Aravind Akella [Wed, 22 Jul 2015 17:50:40 +0000 (17:50 +0000)]
am
74294808: am
e6406e35: (-s ours) Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE
* commit '
7429480806f8687931e99ab1480b9943086c6a00':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE
Aravind Akella [Wed, 22 Jul 2015 17:37:51 +0000 (17:37 +0000)]
am
e6406e35: (-s ours) Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE
* commit '
e6406e3589fa490bfa435384d2a3a6ac678e08fd':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE
Aravind Akella [Tue, 21 Jul 2015 00:29:33 +0000 (17:29 -0700)]
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE
Bug:
22502485
Change-Id: I3d9018649302b98004e4e216b2173e8411a08501
(cherry picked from commit
f504789dd3b3073de176fd2fa09dd9fc9de5bc1f)
Chenjie Luo [Wed, 22 Jul 2015 06:26:27 +0000 (06:26 +0000)]
Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
Lajos Molnar [Tue, 21 Jul 2015 01:37:15 +0000 (01:37 +0000)]
am
d1caedda: am
6b2cf22d: am
b3ca8b29: am
a6364e25: am
f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
* commit '
d1caedda7ba353cecbd35f6e721e8037e111e8ed':
omx: fix structure sizes to be the same on 32 and 64-bit builds
Lajos Molnar [Tue, 21 Jul 2015 01:22:45 +0000 (01:22 +0000)]
am
6b2cf22d: am
b3ca8b29: am
a6364e25: am
f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
* commit '
6b2cf22d140d81de8e3b7769f19e0312ec554c4c':
omx: fix structure sizes to be the same on 32 and 64-bit builds
Lajos Molnar [Tue, 21 Jul 2015 01:05:02 +0000 (01:05 +0000)]
am
b3ca8b29: am
a6364e25: am
f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
* commit '
b3ca8b29dd59c02ccd2a8b72a6e2c9098c300717':
omx: fix structure sizes to be the same on 32 and 64-bit builds
Jeff Sharkey [Tue, 21 Jul 2015 01:00:09 +0000 (01:00 +0000)]
am
b7420d5d: am
bf984850: am
24ac7f32: am
9ca52e34: am
a2307aef: Only restorecon_data once for all users.
* commit '
b7420d5df48dc80086b694d9ec7f9dfc091fc5ae':
Only restorecon_data once for all users.
Lajos Molnar [Tue, 21 Jul 2015 00:50:04 +0000 (00:50 +0000)]
am
a6364e25: am
f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
* commit '
a6364e257d6b0be3c94819cd16fffa2d4d7c8150':
omx: fix structure sizes to be the same on 32 and 64-bit builds
Jeff Sharkey [Tue, 21 Jul 2015 00:42:24 +0000 (00:42 +0000)]
am
bf984850: am
24ac7f32: am
9ca52e34: am
a2307aef: Only restorecon_data once for all users.
* commit '
bf984850204cfe27baf2e482c575352bc53514f5':
Only restorecon_data once for all users.
Lajos Molnar [Tue, 21 Jul 2015 00:37:21 +0000 (00:37 +0000)]
am
f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
* commit '
f892f9141721a3805d18da2db0e1c17f1a99feb0':
omx: fix structure sizes to be the same on 32 and 64-bit builds
Aravind Akella [Tue, 21 Jul 2015 00:29:33 +0000 (17:29 -0700)]
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Bug:
22502485
Change-Id: I3d9018649302b98004e4e216b2173e8411a08501
Jeff Sharkey [Tue, 21 Jul 2015 00:26:15 +0000 (00:26 +0000)]
am
24ac7f32: am
9ca52e34: am
a2307aef: Only restorecon_data once for all users.
* commit '
24ac7f320f4e254808bcefd5964349548b2af1a6':
Only restorecon_data once for all users.
Lajos Molnar [Tue, 21 Jul 2015 00:22:18 +0000 (00:22 +0000)]
Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
Lajos Molnar [Mon, 20 Jul 2015 22:29:24 +0000 (15:29 -0700)]
omx: fix structure sizes to be the same on 32 and 64-bit builds
Bug:
22512621
Change-Id: I2100b8aad0a1cf110936f4a765718ba97f3d8ce7
Jeff Sharkey [Tue, 21 Jul 2015 00:11:39 +0000 (00:11 +0000)]
am
9ca52e34: am
a2307aef: Only restorecon_data once for all users.
* commit '
9ca52e34f742f6b8da936733626c334260c6edc8':
Only restorecon_data once for all users.
Jeff Sharkey [Mon, 20 Jul 2015 23:56:41 +0000 (23:56 +0000)]
am
a2307aef: Only restorecon_data once for all users.
* commit '
a2307aefd06f1310660ef1d35ce01bcfc72c9633':
Only restorecon_data once for all users.
Jeff Sharkey [Mon, 20 Jul 2015 23:26:19 +0000 (16:26 -0700)]
Only restorecon_data once for all users.
restorecon_data already iterates across all found users internally,
so we don't need to call it for each UID moved. In fact, this was a
bug that caused data for the owner to be relabeled when moving apps
back to internal storage.
Bug:
21813384
Change-Id: I5ba76d4f30d129365864c8a25b665f344b99a6b4
Haixia Shi [Mon, 20 Jul 2015 22:31:28 +0000 (22:31 +0000)]
Merge "Delete outdated SurfaceFlinger tests."
Haixia Shi [Mon, 20 Jul 2015 22:18:36 +0000 (15:18 -0700)]
Delete outdated SurfaceFlinger tests.
These tests either do not build or no longer make sense. We should
probably write some new tests.
BUG=
18138368
Change-Id: I4cc2681ca65e7af1f6bbf921f02a13cd6993581c
Haixia Shi [Mon, 20 Jul 2015 22:01:10 +0000 (22:01 +0000)]
Merge "Fix build errors in test-resize."
Haixia Shi [Mon, 20 Jul 2015 21:33:58 +0000 (14:33 -0700)]
Fix build errors in test-resize.
This is one of the SurfaceFlinger tests that doesn't build on TOT.
BUG=
18138368
Change-Id: I338867c3b80afd6d5ede462a72566b04280c7964
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
DO NOT MERGE. Cancel touches as well as pointer gestures.
Bug:
19264992
Change-Id: If48e0953b972c9d69f516906adf7c6faf67e3eb8
Lajos Molnar [Fri, 17 Jul 2015 19:52:53 +0000 (19:52 +0000)]
am
e5942ea2: am
1c9f278a: am
173e09a1: am
59d6f2c3: am
5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped frames
* commit '
e5942ea296bd6e44a72d661ea4f4771e01023f18':
BufferQueueConsumer: signal onFrameReleased on dropped frames
Lajos Molnar [Fri, 17 Jul 2015 19:29:23 +0000 (19:29 +0000)]
am
1c9f278a: am
173e09a1: am
59d6f2c3: am
5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped frames
* commit '
1c9f278ae6935186b0bee62a3939a1ac3ec98392':
BufferQueueConsumer: signal onFrameReleased on dropped frames
Lajos Molnar [Fri, 17 Jul 2015 19:13:17 +0000 (19:13 +0000)]
am
173e09a1: am
59d6f2c3: am
5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped frames
* commit '
173e09a17e69aef4f0c3cb1f3ba06f2bd5d95876':
BufferQueueConsumer: signal onFrameReleased on dropped frames
Lajos Molnar [Fri, 17 Jul 2015 18:57:55 +0000 (18:57 +0000)]
am
59d6f2c3: am
5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped frames
* commit '
59d6f2c322080c5fee214ba2401ab271fd0440f7':
BufferQueueConsumer: signal onFrameReleased on dropped frames
Lajos Molnar [Fri, 17 Jul 2015 18:39:25 +0000 (18:39 +0000)]
am
5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped frames
* commit '
5f920c1a2cf12c0638c05fbddee8ff6c1193731c':
BufferQueueConsumer: signal onFrameReleased on dropped frames
Lajos Molnar [Mon, 13 Jul 2015 23:04:24 +0000 (16:04 -0700)]
BufferQueueConsumer: signal onFrameReleased on dropped frames
Bug:
22552826
Change-Id: I9bdfeb8c68f403301af90d4b494f0ae7166a767c
Andreas Gampe [Fri, 17 Jul 2015 02:00:45 +0000 (02:00 +0000)]
am
0b020958: am
9cf822d1: am
25b2ed03: Merge "Installd: Add a swap override flag"
* commit '
0b020958a9549926a720890c1bfe550a82e9199d':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 02:00:44 +0000 (02:00 +0000)]
am
97530828: am
7d8852f8: am
f82926fc: am
a0abdab2: am
c968c017: Installd: Add a swap override flag
* commit '
97530828d1d2e4188b9764abe04ae556b5ccd115':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:50:51 +0000 (01:50 +0000)]
am
9cf822d1: am
25b2ed03: Merge "Installd: Add a swap override flag"
* commit '
9cf822d131634e49a0b7cd8f0e57ae6b620e32b4':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:47:52 +0000 (01:47 +0000)]
am
7d8852f8: am
f82926fc: am
a0abdab2: am
c968c017: Installd: Add a swap override flag
* commit '
7d8852f8a10638f3a8614a3a60e40ac9ffeb74bd':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:31:46 +0000 (01:31 +0000)]
am
f82926fc: am
a0abdab2: am
c968c017: Installd: Add a swap override flag
* commit '
f82926fc02a6fecb28b1a6fd759035177064de5b':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:31:13 +0000 (01:31 +0000)]
am
25b2ed03: Merge "Installd: Add a swap override flag"
* commit '
25b2ed03487b7c7b4e5e6897525a169ee32b1998':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:23:10 +0000 (01:23 +0000)]
Merge "Installd: Add a swap override flag"
Andreas Gampe [Fri, 17 Jul 2015 01:21:17 +0000 (01:21 +0000)]
am
a0abdab2: am
c968c017: Installd: Add a swap override flag
* commit '
a0abdab2fe67032d5edc850f6e69041fb2caf153':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:03:24 +0000 (01:03 +0000)]
am
c968c017: Installd: Add a swap override flag
* commit '
c968c0175e967e39e72f557b5e014b9575ba4727':
Installd: Add a swap override flag
Andreas Gampe [Thu, 16 Jul 2015 22:55:41 +0000 (15:55 -0700)]
Installd: Add a swap override flag
Add dalvik.vm.dex2oat-swap system property to override a default
decision.
Bug:
20658562
(cherry picked from commit
c968c0175e967e39e72f557b5e014b9575ba4727)
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
Andreas Gampe [Thu, 16 Jul 2015 22:55:41 +0000 (15:55 -0700)]
Installd: Add a swap override flag
Add dalvik.vm.dex2oat-swap system property to override a default
decision.
Bug:
20658562
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
Evgenii Stepanov [Wed, 15 Jul 2015 00:32:58 +0000 (00:32 +0000)]
am
a637ba9f: am
3e7e4990: am
5e8dcf1c: Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
* commit '
a637ba9fe64f7219a7d37f85055a18879a43d427':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Evgenii Stepanov [Wed, 15 Jul 2015 00:18:13 +0000 (00:18 +0000)]
am
3e7e4990: am
5e8dcf1c: Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
* commit '
3e7e4990132dba03431ed77cd89b1ad3493a8fea':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Evgenii Stepanov [Wed, 15 Jul 2015 00:02:44 +0000 (00:02 +0000)]
am
5e8dcf1c: Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
* commit '
5e8dcf1c1fbd060f1bd2ba8d45bbc228bb310a7e':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Evgenii Stepanov [Tue, 14 Jul 2015 23:47:59 +0000 (23:47 +0000)]
Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
Adrian Roos [Tue, 14 Jul 2015 20:19:56 +0000 (20:19 +0000)]
am
b22b9821: am
9f6ac49d: am
49d176e6: am
31e138db: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit '
b22b9821b3f9e0309c5ed67f1703598a464669fc':
Show charging speed on Keyguard
Adrian Roos [Tue, 14 Jul 2015 20:01:21 +0000 (20:01 +0000)]
am
9f6ac49d: am
49d176e6: am
31e138db: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit '
9f6ac49dd23150a81b985764c9cede3e28c12309':
Show charging speed on Keyguard
Adrian Roos [Tue, 14 Jul 2015 19:46:00 +0000 (19:46 +0000)]
am
49d176e6: am
31e138db: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit '
49d176e6aaafa45101d80bad5396124df1a161e9':
Show charging speed on Keyguard
Adrian Roos [Tue, 14 Jul 2015 19:31:52 +0000 (19:31 +0000)]
am
31e138db: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit '
31e138db15b2460a0bb34d78f5b01d66cc8428f1':
Show charging speed on Keyguard
Adrian Roos [Tue, 14 Jul 2015 19:17:00 +0000 (19:17 +0000)]
Merge "Show charging speed on Keyguard" into mnc-dr-dev
Michael Wright [Tue, 14 Jul 2015 18:48:35 +0000 (18:48 +0000)]
am
094eff2f: am
5d7bba1c: am
cb04b4a0: am
82c4163e: am
fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
094eff2f8b4fb15ae88073c02cdd27824fbcc217':
Cancel touches as well as pointer gestures.
Aravind Akella [Tue, 14 Jul 2015 18:46:38 +0000 (18:46 +0000)]
am
36b21a66: am
19060d9f: am
170b6ab7: am
a4864d61: am
4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev
* commit '
36b21a6626cddad16beff421bfdc67965d1abb84':
Rename wakelock held internally by SensorService.
Michael Wright [Tue, 14 Jul 2015 18:15:07 +0000 (18:15 +0000)]
am
5d7bba1c: am
cb04b4a0: am
82c4163e: am
fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
5d7bba1c3795663c970cfd3fed85d4cabc27bc25':
Cancel touches as well as pointer gestures.
Aravind Akella [Tue, 14 Jul 2015 17:15:53 +0000 (17:15 +0000)]
am
19060d9f: am
170b6ab7: am
a4864d61: am
4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev
* commit '
19060d9fac7bfe143004b8a2a5ef2a0273cf4302':
Rename wakelock held internally by SensorService.
Michael Wright [Tue, 14 Jul 2015 15:03:54 +0000 (15:03 +0000)]
am
cb04b4a0: am
82c4163e: am
fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
cb04b4a0e6cdb05a3c900312cb3a7b2dd855e11e':
Cancel touches as well as pointer gestures.
Michael Wright [Tue, 14 Jul 2015 14:50:45 +0000 (14:50 +0000)]
am
82c4163e: am
fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
82c4163ef55e691a1706625ff83a776598f50492':
Cancel touches as well as pointer gestures.
Michael Wright [Tue, 14 Jul 2015 14:39:07 +0000 (14:39 +0000)]
am
fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
fd54957888a2fd692e1a8590d7e9e98e4da9ca4d':
Cancel touches as well as pointer gestures.
Michael Wright [Tue, 14 Jul 2015 14:22:36 +0000 (14:22 +0000)]
Merge "Cancel touches as well as pointer gestures." into mnc-dev
Aravind Akella [Tue, 14 Jul 2015 00:42:52 +0000 (00:42 +0000)]
am
170b6ab7: am
a4864d61: am
4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev
* commit '
170b6ab7e4fbc87d150bdeb2b5f04e8bf074da96':
Rename wakelock held internally by SensorService.
Aravind Akella [Mon, 13 Jul 2015 23:39:11 +0000 (23:39 +0000)]
am
a4864d61: am
4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev
* commit '
a4864d61dcf65341134887e347d11fbe9bb8a694':
Rename wakelock held internally by SensorService.
Aravind Akella [Mon, 13 Jul 2015 23:02:20 +0000 (23:02 +0000)]
am
4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev
* commit '
4904821b212a3ee91f22a51295f86f6339cbcc8d':
Rename wakelock held internally by SensorService.
Aravind Akella [Mon, 13 Jul 2015 18:21:48 +0000 (18:21 +0000)]
Merge "Rename wakelock held internally by SensorService." into mnc-dev
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
Cancel touches as well as pointer gestures.
Bug:
19264992
Change-Id: If48e0953b972c9d69f516906adf7c6faf67e3eb8
Adrian Roos [Fri, 10 Jul 2015 20:08:28 +0000 (13:08 -0700)]
Show charging speed on Keyguard
Bug:
8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
Aravind Akella [Fri, 10 Jul 2015 18:24:28 +0000 (11:24 -0700)]
Rename wakelock held internally by SensorService.
Bug:
22076400
Change-Id: I62129549b0681f200f40da01f53140245309ed88
Qiwen Zhao [Fri, 10 Jul 2015 02:44:53 +0000 (02:44 +0000)]
am
dd6b3ff8: (-s ours) am
89c7bd86: (-s ours) am
5cf4b4e1: (-s ours) am
3f8fbfdb: (-s ours) am
982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to
570052f with history.
* commit '
dd6b3ff8695e8fc3bf374b607444ebc829067c24':
Qiwen Zhao [Fri, 10 Jul 2015 02:29:37 +0000 (02:29 +0000)]
am
89c7bd86: (-s ours) am
5cf4b4e1: (-s ours) am
3f8fbfdb: (-s ours) am
982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to
570052f with history.
* commit '
89c7bd8695dc243e7c1e1f4dc011a9b1b9552ff5':
Qiwen Zhao [Fri, 10 Jul 2015 02:13:10 +0000 (02:13 +0000)]
am
5cf4b4e1: (-s ours) am
3f8fbfdb: (-s ours) am
982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to
570052f with history.
* commit '
5cf4b4e1ed7a24f95440a3f072a60e2a3c1c7bec':
Qiwen Zhao [Fri, 10 Jul 2015 01:54:35 +0000 (01:54 +0000)]
am
3f8fbfdb: (-s ours) am
982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to
570052f with history.
* commit '
3f8fbfdb9bde70454f617ab8f59874bdf132cb29':
Qiwen Zhao [Fri, 10 Jul 2015 01:43:07 +0000 (01:43 +0000)]
am
982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to
570052f with history.
* commit '
982719b179aecc33aa6c258318fcbf6e4faa81d7':
Michael Wright [Fri, 10 Jul 2015 00:55:56 +0000 (00:55 +0000)]
am
9b70ab7a: am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
9b70ab7a3cb260205e81e40ba181a86710d2eb95':
Cancel touches as well as pointer gestures.
Qiwen Zhao [Fri, 10 Jul 2015 00:39:23 +0000 (17:39 -0700)]
DO NOT MERGE ANYWHERE. reset back to
570052f with history.
Michael Wright [Fri, 10 Jul 2015 00:26:36 +0000 (00:26 +0000)]
am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
f37143d8a55afc6481d31de1c6f8e8db9578ef1d':
Cancel touches as well as pointer gestures.
Introduce stem keycodes for Wear
Mock out more inputflinger host functions
Remove unused ParcelFileDescriptor methods in parcel.
Basic implementation of input device properties.
Michael Wright [Thu, 9 Jul 2015 21:56:20 +0000 (21:56 +0000)]
Merge "Cancel touches as well as pointer gestures." into mnc-dev
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
Cancel touches as well as pointer gestures.
Bug:
19264992
Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
Elliott Hughes [Thu, 9 Jul 2015 18:39:09 +0000 (18:39 +0000)]
am
153008ef: am
9df25446: am
9bad590e: Merge "Binder on Windows? Unlikely."
* commit '
153008efb5a00ed3c18d588ce15f90d2442a9786':
Binder on Windows? Unlikely.
Elliott Hughes [Thu, 9 Jul 2015 17:57:36 +0000 (17:57 +0000)]
am
9df25446: am
9bad590e: Merge "Binder on Windows? Unlikely."
* commit '
9df254460b2dfd3db1132affc9489d0be01def23':
Binder on Windows? Unlikely.
Elliott Hughes [Thu, 9 Jul 2015 17:29:47 +0000 (17:29 +0000)]
am
9bad590e: Merge "Binder on Windows? Unlikely."
* commit '
9bad590ef91c655fb9a0212e5a347aaa3e350bb0':
Binder on Windows? Unlikely.
Elliott Hughes [Thu, 9 Jul 2015 17:16:58 +0000 (17:16 +0000)]
Merge "Binder on Windows? Unlikely."
Elliott Hughes [Thu, 9 Jul 2015 17:04:34 +0000 (10:04 -0700)]
Binder on Windows? Unlikely.
Change-Id: I36c1bee4ed33b9b0d24109a6dbaefa0548dd5aa8
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
Jeff Sharkey [Wed, 8 Jul 2015 02:06:38 +0000 (02:06 +0000)]
am
f0a34a2d: am
570052f7: Merge "Split app move into separate copy/delete steps." into mnc-dev
* commit '
f0a34a2d1e774bcf3aad2fe5af2140d5ed083fde':
Split app move into separate copy/delete steps.
OSDN Git Service
