Michael Wright
18108fd683
am 1362ec74: Merge commit \'62ec2dd5\' into mm
...
* commit '1362ec74fc4f1dc223c9c322f8f49c966ba67594':
DO NOT MERGE Add new media navigation keys.
2015-08-07 18:00:55 +00:00
Michael Wright
1362ec74fc
Merge commit '62ec2dd5' into mm
...
Change-Id: I34801df36735545fc500486209573ed2864a0430
2015-08-07 18:12:20 +01:00
Lajos Molnar
bcaa8d5a6c
OMX: clarify EOS signaling for tunneled decoders
...
Bug: 22859209
Change-Id: Ie28da1b80e4a8dd5ae2806e300ed37287c9c57a8
2015-08-07 10:10:31 -07:00
Michael Wright
62ec2dd563
DO NOT MERGE Add new media navigation keys.
...
Bug: 22059484
Change-Id: I587eb7622555194f18f403da583e3b70656a530e
2015-08-07 14:46:16 +01:00
Dan Stoza
2121b93725
am 04eeb288: am 50be1df7: Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
...
* commit '04eeb2882567412cdcec5981b50c9e7c024b03cc':
SF: Track missed frames and optionally drop them
2015-08-05 19:02:53 +00:00
Dan Stoza
04eeb28825
am 50be1df7: Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
...
* commit '50be1df76e2c84fc3c893ec3d3e51ba427dd3ee6':
SF: Track missed frames and optionally drop them
2015-08-05 18:55:39 +00:00
Dan Stoza
50be1df76e
Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
2015-08-05 18:48:10 +00:00
Naveen Leekha
da7645d6ab
am 7fa5c04d: am c14a850f: am ea2afa46: Merge "Fix parsing of extension string" into mnc-dev
...
* commit '7fa5c04d22416a3de239beea4c0f9d20229cf10a':
Fix parsing of extension string
2015-08-03 15:05:12 +00:00
Naveen Leekha
7fa5c04d22
am c14a850f: am ea2afa46: Merge "Fix parsing of extension string" into mnc-dev
...
* commit 'c14a850f65b2946cad808c0abb8740e800b74ab8':
Fix parsing of extension string
2015-08-03 14:57:57 +00:00
Naveen Leekha
c14a850f65
am ea2afa46: Merge "Fix parsing of extension string" into mnc-dev
...
* commit 'ea2afa460a2c2ee6c44406c1993e8bbacac838ba':
Fix parsing of extension string
2015-08-03 14:51:31 +00:00
Naveen Leekha
ea2afa460a
Merge "Fix parsing of extension string" into mnc-dev
2015-08-03 14:45:11 +00:00
Michael Lentine
e2fc6f87be
Fix parsing of extension string
...
Previously the parsing found the next space and then added the the difference
between the current position and space to the set of tokens. This improperly
generated empty strings if there were consecutive spaces or if spaces existed at
the beginning or end of strings. To fix this, the parse is modified to use
simple stringstream parsing.
Bug: 22709246
Change-Id: I9e32c07bbf984eadccdadf1dc34437fa0c46088b
2015-07-31 09:26:58 -07:00
Dan Stoza
f36738d37f
am dca480ff: am 03d7e301: am d87defaf: SF: Allow present if sideband stream changed
...
* commit 'dca480ff7c87b0aea89b079069405aeaaa9942da':
SF: Allow present if sideband stream changed
2015-07-31 15:56:27 +00:00
Aravind Akella
abf3716884
am 5ed0df2d: am e2806cb4: Bug fix in SensorManager.
...
* commit '5ed0df2d13be64ccf78f82282035f26eaddca557':
Bug fix in SensorManager.
2015-07-31 15:56:26 +00:00
Dan Stoza
dca480ff7c
am 03d7e301: am d87defaf: SF: Allow present if sideband stream changed
...
* commit '03d7e301c8beb971df7b560d1f16503ba3d6f440':
SF: Allow present if sideband stream changed
2015-07-31 15:49:43 +00:00
Dan Stoza
03d7e301c8
am d87defaf: SF: Allow present if sideband stream changed
...
* commit 'd87defaf486ff4e9c0066754564851cfb7be49ed':
SF: Allow present if sideband stream changed
2015-07-31 15:44:52 +00:00
Aravind Akella
cbf4004fc4
Bug fix in SensorManager.
...
If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.
Bug: 22529981
Change-Id: I3c506d962b61347085fc80b2c5832289539d6853
(cherry picked from commit e2806cb445
2015-07-31 00:01:14 +00:00
Aravind Akella
5ed0df2d13
am e2806cb4: Bug fix in SensorManager.
...
* commit 'e2806cb4456e3815e979f333ed23ec7df591a9ff':
Bug fix in SensorManager.
2015-07-30 21:05:51 +00:00
Aravind Akella
e2806cb445
Bug fix in SensorManager.
...
If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.
Bug: 22529981
Change-Id: I3c506d962b61347085fc80b2c5832289539d6853
2015-07-30 19:05:21 +00:00
Dan Stoza
d87defaf48
SF: Allow present if sideband stream changed
...
Allows the sideband layer to be passed all the way to HWC instead of
getting blocked by the updated PTS tracking code.
Bug: 22291067
Change-Id: Ic2f20a7528e276fff054e86ca35789c26873b348
2015-07-29 16:15:50 -07:00
Narayan Kamath
68b84a1c2e
am 14d2548a: am 65f1d44c: am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
...
* commit '14d2548ab76fa60c0547abdadb26cd27c295fd7c':
Revert "Bug fix in SensorManager."
2015-07-29 10:47:21 +00:00
Narayan Kamath
14d2548ab7
am 65f1d44c: am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
...
* commit '65f1d44cd8d96a4555ce6929bb5e2022307738e8':
Revert "Bug fix in SensorManager."
2015-07-29 10:27:27 +00:00
Narayan Kamath
65f1d44cd8
am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
...
* commit 'a29db50c448f8d00a544b925544f3dee725f7750':
Revert "Bug fix in SensorManager."
2015-07-29 10:07:56 +00:00
Narayan Kamath
a29db50c44
Merge "Revert "Bug fix in SensorManager."" into mnc-dev
2015-07-29 09:41:23 +00:00
Narayan Kamath
8034fc63a0
Revert "Bug fix in SensorManager."
...
This reverts commit 869eb2089e
2015-07-29 09:36:05 +00:00
Aravind Akella
e622edebfb
am b04e02b9: am 3a77d009: am 2376bd68: Merge "Bug fix in SensorManager." into mnc-dev
...
* commit 'b04e02b9f70b7a26d1a8dc5927e4fca51168a759':
Bug fix in SensorManager.
2015-07-29 01:23:29 +00:00
Aravind Akella
b04e02b9f7
am 3a77d009: am 2376bd68: Merge "Bug fix in SensorManager." into mnc-dev
...
* commit '3a77d009273731eeeb6782f0eee6458c46f30208':
Bug fix in SensorManager.
2015-07-29 01:01:55 +00:00
Aravind Akella
3a77d00927
am 2376bd68: Merge "Bug fix in SensorManager." into mnc-dev
...
* commit '2376bd6869f4cd835a351322d48d35567eceec4f':
Bug fix in SensorManager.
2015-07-29 00:40:49 +00:00
Aravind Akella
2376bd6869
Merge "Bug fix in SensorManager." into mnc-dev
2015-07-29 00:21:09 +00:00
Aravind Akella
869eb2089e
Bug fix in SensorManager.
...
If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.
Bug: 22529981
Change-Id: I4ba6b760608e34d79273aeb39568f0fa72fbaf9d
2015-07-26 11:48:06 -07:00
Sharvil Nanavati
787bef0812
am 0a4a069a: Merge "Dump raft logs in bugreports if they exist." into cw-e-dev
...
* commit '0a4a069a83e187b34b72169b2de91c78ac287858':
Dump raft logs in bugreports if they exist.
2015-07-24 17:57:12 +00:00
Sharvil Nanavati
0a4a069a83
Merge "Dump raft logs in bugreports if they exist." into cw-e-dev
2015-07-24 17:44:59 +00:00
Sharvil Nanavati
8d4cb7ffc1
Dump raft logs in bugreports if they exist.
...
Change-Id: I7773b8b86675d9ebf3f6d158eaaa11e47619800e
2015-07-24 02:01:13 -07:00
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
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
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
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
