Jim Miller
b71eca07d0
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
2015-07-24 03:41:23 +00:00
Chenjie Luo
f369a4fc10
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.
2015-07-24 03:41:22 +00:00
Jim Miller
5f87f0b4b7
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
2015-07-24 03:22:52 +00:00
Chenjie Luo
24c8f4b156
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.
2015-07-24 03:02:43 +00:00
Jim Miller
40481a7126
am bf7cd01a
: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
...
* commit 'bf7cd01ab0fce5c76364f78e3b9fdba078c197c0':
Add FEATURE_FINGERPRINT to PackageManager's feature list
2015-07-24 02:53:59 +00:00
Jim Miller
bf7cd01ab0
Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev
2015-07-24 02:41:02 +00:00
Jim Miller
c89cf5f76e
Add FEATURE_FINGERPRINT to PackageManager's feature list
...
Fixes bug 22674557
Change-Id: I2ced132c1cb4f4b5166f9af288dd3e697fdcf92b
2015-07-24 02:39:06 +00:00
Michael Wright
ad0db31c69
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.
2015-07-23 19:46:18 +00:00
Michael Wright
9202e49dc9
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.
2015-07-23 19:21:23 +00:00
Dan Stoza
14cd37cf3d
SF: Track missed frames and optionally drop them
...
Adds code to track whether SurfaceFlinger has sent two frames to HWC in
the same vsync window. This can occur if one frame is delayed so far
it slips into the next window or just if one frame takes an abnormal
amount of time. If this occurs, it shows up as FrameMissed in systrace.
Also adds a property debug.sf.drop_missed_frames which, if set, tells
SurfaceFlinger to skip sending a frame to HWC (i.e., calling
prepare/set) when we detect this condition, which can help prevent
backpressure from the HWC implementation.
Bug: 22513558
Change-Id: I2df0d44cec5fd6edba419388d8c90b5710d1a5b6
2015-07-23 11:15:32 -07:00
Michael Wright
5ea7ea44a2
Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev
2015-07-23 16:32:02 +00:00
The Android Automerger
5fbeececf3
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-07-23 01:01:59 -07:00
Chenjie Luo
177a416625
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.
2015-07-22 20:23:43 +00:00
Aravind Akella
5a02de8bcc
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
2015-07-22 17:50:40 +00:00
Aravind Akella
7429480806
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
2015-07-22 17:37:51 +00:00
The Android Automerger
54e63fe237
merge in mnc-release history after reset to mnc-dev
2015-07-22 01:05:28 -07:00
Aravind Akella
e6406e3589
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 f504789dd3
)
2015-07-22 06:27:05 +00:00
Chenjie Luo
99426810e4
Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
2015-07-22 06:26:27 +00:00
The Android Automerger
38e32c9d60
merge in mnc-release history after reset to mnc-dev
2015-07-21 01:05:56 -07:00
The Android Automerger
58d353a15d
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-07-21 01:03:17 -07:00
Lajos Molnar
6b2cf22d14
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
2015-07-21 01:05:02 +00:00
Lajos Molnar
b3ca8b29dd
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
2015-07-21 00:50:04 +00:00
Lajos Molnar
a6364e257d
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
2015-07-21 00:37:21 +00:00
Aravind Akella
f504789dd3
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
...
Bug: 22502485
Change-Id: I3d9018649302b98004e4e216b2173e8411a08501
2015-07-20 17:32:09 -07:00
Jeff Sharkey
bf98485020
am 24ac7f32
: am 9ca52e34
: am a2307aef
: Only restorecon_data once for all users.
...
* commit '24ac7f320f4e254808bcefd5964349548b2af1a6':
Only restorecon_data once for all users.
2015-07-21 00:26:15 +00:00
Lajos Molnar
f892f91417
Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
2015-07-21 00:22:19 +00:00
Lajos Molnar
abaaf70129
omx: fix structure sizes to be the same on 32 and 64-bit builds
...
Bug: 22512621
Change-Id: I2100b8aad0a1cf110936f4a765718ba97f3d8ce7
2015-07-21 00:19:04 +00:00
Jeff Sharkey
24ac7f320f
am 9ca52e34
: am a2307aef
: Only restorecon_data once for all users.
...
* commit '9ca52e34f742f6b8da936733626c334260c6edc8':
Only restorecon_data once for all users.
2015-07-21 00:11:39 +00:00
Jeff Sharkey
9ca52e34f7
am a2307aef
: Only restorecon_data once for all users.
...
* commit 'a2307aefd06f1310660ef1d35ce01bcfc72c9633':
Only restorecon_data once for all users.
2015-07-20 23:56:41 +00:00
Jeff Sharkey
a2307aefd0
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
2015-07-20 16:26:22 -07:00
Michael Wright
e6f6ad04ed
DO NOT MERGE. Cancel touches as well as pointer gestures.
...
Bug: 19264992
Change-Id: If48e0953b972c9d69f516906adf7c6faf67e3eb8
2015-07-20 16:08:21 +01:00
The Android Automerger
5526b6edde
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-07-18 18:45:37 -07:00
The Android Automerger
2c907cfb5c
merge in mnc-release history after reset to mnc-dev
2015-07-18 01:04:21 -07:00
Lajos Molnar
1c9f278ae6
am 173e09a1
: am 59d6f2c3
: am 5f920c1a
: BufferQueueConsumer: signal onFrameReleased on dropped frames
...
* commit '173e09a17e69aef4f0c3cb1f3ba06f2bd5d95876':
BufferQueueConsumer: signal onFrameReleased on dropped frames
2015-07-17 19:13:17 +00:00
Lajos Molnar
173e09a17e
am 59d6f2c3
: am 5f920c1a
: BufferQueueConsumer: signal onFrameReleased on dropped frames
...
* commit '59d6f2c322080c5fee214ba2401ab271fd0440f7':
BufferQueueConsumer: signal onFrameReleased on dropped frames
2015-07-17 18:57:55 +00:00
Lajos Molnar
59d6f2c322
am 5f920c1a
: BufferQueueConsumer: signal onFrameReleased on dropped frames
...
* commit '5f920c1a2cf12c0638c05fbddee8ff6c1193731c':
BufferQueueConsumer: signal onFrameReleased on dropped frames
2015-07-17 18:39:25 +00:00
Lajos Molnar
5f920c1a2c
BufferQueueConsumer: signal onFrameReleased on dropped frames
...
Bug: 22552826
Change-Id: I9bdfeb8c68f403301af90d4b494f0ae7166a767c
2015-07-17 08:37:47 -07:00
Andreas Gampe
7d8852f8a1
am f82926fc
: am a0abdab2
: am c968c017
: Installd: Add a swap override flag
...
* commit 'f82926fc02a6fecb28b1a6fd759035177064de5b':
Installd: Add a swap override flag
2015-07-17 01:31:46 +00:00
Andreas Gampe
f82926fc02
am a0abdab2
: am c968c017
: Installd: Add a swap override flag
...
* commit 'a0abdab2fe67032d5edc850f6e69041fb2caf153':
Installd: Add a swap override flag
2015-07-17 01:21:17 +00:00
Andreas Gampe
a0abdab2fe
am c968c017
: Installd: Add a swap override flag
...
* commit 'c968c0175e967e39e72f557b5e014b9575ba4727':
Installd: Add a swap override flag
2015-07-17 01:03:24 +00:00
Andreas Gampe
c968c0175e
Installd: Add a swap override flag
...
Add dalvik.vm.dex2oat-swap system property to override a default
decision.
Bug: 20658562
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
2015-07-16 15:55:41 -07:00
The Android Automerger
348286159f
merge in mnc-release history after reset to mnc-dev
2015-07-15 01:04:39 -07:00
The Android Automerger
2061378ccb
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-07-15 01:03:08 -07:00
Adrian Roos
9f6ac49dd2
am 49d176e6
: am 31e138db
: Merge "Show charging speed on Keyguard" into mnc-dr-dev
...
* commit '49d176e6aaafa45101d80bad5396124df1a161e9':
Show charging speed on Keyguard
2015-07-14 19:46:00 +00:00
Adrian Roos
49d176e6aa
am 31e138db
: Merge "Show charging speed on Keyguard" into mnc-dr-dev
...
* commit '31e138db15b2460a0bb34d78f5b01d66cc8428f1':
Show charging speed on Keyguard
2015-07-14 19:31:52 +00:00
Adrian Roos
31e138db15
Merge "Show charging speed on Keyguard" into mnc-dr-dev
2015-07-14 19:17:11 +00:00
Michael Wright
5d7bba1c37
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.
2015-07-14 15:03:54 +00:00
Michael Wright
cb04b4a0e6
am 82c4163e
: am fd549578
: Merge "Cancel touches as well as pointer gestures." into mnc-dev
...
* commit '82c4163ef55e691a1706625ff83a776598f50492':
Cancel touches as well as pointer gestures.
2015-07-14 14:50:45 +00:00
Michael Wright
82c4163ef5
am fd549578
: Merge "Cancel touches as well as pointer gestures." into mnc-dev
...
* commit 'fd54957888a2fd692e1a8590d7e9e98e4da9ca4d':
Cancel touches as well as pointer gestures.
2015-07-14 14:39:07 +00:00
Michael Wright
fd54957888
Merge "Cancel touches as well as pointer gestures." into mnc-dev
2015-07-14 14:22:38 +00:00