summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of d213f5e7 to cw-e-devMark Salyzyn2015-08-111-0/+2
|\ | | | | | | Change-Id: Iaea0fdd483b4d0988df442f9b291b99943009829
| * am ecc0763e: dumpstate: add logcat -b all -SMark Salyzyn2015-08-111-0/+2
| |\ | | | | | | | | | | | | * commit 'ecc0763e6c96c418ea4ee6c993d58d16a58407b3': dumpstate: add logcat -b all -S
| | * dumpstate: add logcat -b all -SMark Salyzyn2015-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit e3c4df96083231b519dad919fd0ed6624100b368) - For those that are proud to call themselves logspam police - Every time someone declares that something is too chatty, or that they lost their logs because they were declared too chatty and their associated logs were aggresively pruned we generally ask them to report the logger statistics to pinpoint what software product that is the elephant in the room. - Every time we want to spawn a new 'stop being so spammy' bug spawned off a bugreport collected for another purpose, we *wish* we had the logger statistics to help add gravitas to the claim that some piece of software is the top, or near the top, polluter. Bug: 22351810 Change-Id: Ifae33cd21d0ae2917a3b4381502d723725b1701c
* | | am 1362ec74: Merge commit \'62ec2dd5\' into mmMichael Wright2015-08-072-1/+9
|\ \ \ | |/ / | | | | | | | | | * commit '1362ec74fc4f1dc223c9c322f8f49c966ba67594': DO NOT MERGE Add new media navigation keys.
| * | Merge commit '62ec2dd5' into mmMichael Wright2015-08-072-1/+9
| |\ \ | | |/ | | | | | | Change-Id: I34801df36735545fc500486209573ed2864a0430
| | * DO NOT MERGE Add new media navigation keys.Michael Wright2015-08-072-1/+9
| | | | | | | | | | | | | | | Bug: 22059484 Change-Id: I587eb7622555194f18f403da583e3b70656a530e
* | | am 50be1df7: Merge "SF: Track missed frames and optionally drop them" into ↵Dan Stoza2015-08-052-6/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | mnc-dr-dev * commit '50be1df76e2c84fc3c893ec3d3e51ba427dd3ee6': SF: Track missed frames and optionally drop them
| * | Merge "SF: Track missed frames and optionally drop them" into mnc-dr-devDan Stoza2015-08-052-6/+29
| |\ \
| | * | SF: Track missed frames and optionally drop themDan Stoza2015-07-232-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am c14a850f: am ea2afa46: Merge "Fix parsing of extension string" into mnc-devNaveen Leekha2015-08-031-9/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c14a850f65b2946cad808c0abb8740e800b74ab8': Fix parsing of extension string
| * | | am ea2afa46: Merge "Fix parsing of extension string" into mnc-devNaveen Leekha2015-08-031-9/+8
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'ea2afa460a2c2ee6c44406c1993e8bbacac838ba': Fix parsing of extension string
| | * | Merge "Fix parsing of extension string" into mnc-devNaveen Leekha2015-08-031-9/+8
| | |\ \
| | | * | Fix parsing of extension stringMichael Lentine2015-07-311-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 03d7e301: am d87defaf: SF: Allow present if sideband stream changedDan Stoza2015-07-311-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '03d7e301c8beb971df7b560d1f16503ba3d6f440': SF: Allow present if sideband stream changed
| * | | | am d87defaf: SF: Allow present if sideband stream changedDan Stoza2015-07-311-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd87defaf486ff4e9c0066754564851cfb7be49ed': SF: Allow present if sideband stream changed
| | * | | SF: Allow present if sideband stream changedDan Stoza2015-07-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am e2806cb4: Bug fix in SensorManager.Aravind Akella2015-07-302-54/+61
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'e2806cb4456e3815e979f333ed23ec7df591a9ff': Bug fix in SensorManager.
| * | | | Bug fix in SensorManager.Aravind Akella2015-07-302-54/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SensorService hasn't started when SensorManager instance is requested, keep retrying for a longer duration. Bug: 22529981 Change-Id: I3c506d962b61347085fc80b2c5832289539d6853
* | | | | am 65f1d44c: am a29db50c: Merge "Revert "Bug fix in SensorManager."" into ↵Narayan Kamath2015-07-292-11/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '65f1d44cd8d96a4555ce6929bb5e2022307738e8': Revert "Bug fix in SensorManager."
| * | | | am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-devNarayan Kamath2015-07-292-11/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'a29db50c448f8d00a544b925544f3dee725f7750': Revert "Bug fix in SensorManager."
| | * | | Merge "Revert "Bug fix in SensorManager."" into mnc-devNarayan Kamath2015-07-292-11/+4
| | |\ \ \
| | | * | | Revert "Bug fix in SensorManager."Narayan Kamath2015-07-292-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 869eb2089ec8a6286b944bfcff57e4cbe0c7e207. Change-Id: I4fb865e3b18bbb011fa4e4b4732336930c3a45ae
* | | | | | am 3a77d009: am 2376bd68: Merge "Bug fix in SensorManager." into mnc-devAravind Akella2015-07-292-4/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '3a77d009273731eeeb6782f0eee6458c46f30208': Bug fix in SensorManager.
| * | | | | am 2376bd68: Merge "Bug fix in SensorManager." into mnc-devAravind Akella2015-07-292-4/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2376bd6869f4cd835a351322d48d35567eceec4f': Bug fix in SensorManager.
| | * | | | Merge "Bug fix in SensorManager." into mnc-devAravind Akella2015-07-292-4/+11
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug fix in SensorManager.Aravind Akella2015-07-262-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SensorService hasn't started when SensorManager instance is requested, keep retrying for a longer duration. Bug: 22529981 Change-Id: I4ba6b760608e34d79273aeb39568f0fa72fbaf9d
* | | | | | Merge "Dump raft logs in bugreports if they exist." into cw-e-devSharvil Nanavati2015-07-241-0/+3
|\ \ \ \ \ \
| * | | | | | Dump raft logs in bugreports if they exist.Sharvil Nanavati2015-07-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7773b8b86675d9ebf3f6d158eaaa11e47619800e
* | | | | | | am 40481a71: am bf7cd01a: Merge "Add FEATURE_FINGERPRINT to ↵Jim Miller2015-07-241-0/+20
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackageManager\'s feature list" into mnc-dev * commit '40481a7126095606865f6b4c172e1f8d9cbf22f3': Add FEATURE_FINGERPRINT to PackageManager's feature list
| * | | | | | am bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature ↵Jim Miller2015-07-241-0/+20
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | list" into mnc-dev * commit 'bf7cd01ab0fce5c76364f78e3b9fdba078c197c0': Add FEATURE_FINGERPRINT to PackageManager's feature list
| | * | | | Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-devJim Miller2015-07-241-0/+20
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Add FEATURE_FINGERPRINT to PackageManager's feature listJim Miller2015-07-241-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 22674557 Change-Id: I2ced132c1cb4f4b5166f9af288dd3e697fdcf92b
* | | | | | am 177a4166: am 99426810: Merge "Check for the presence of accel and ↵Chenjie Luo2015-07-241-2/+8
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | 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.
| * | | | am 99426810: Merge "Check for the presence of accel and magnetometer sensors ↵Chenjie Luo2015-07-221-2/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | before adding AOSP fusion sensors." into mnc-dev * commit '99426810e4828719be84a0f8c186161578512e93': Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
| | * | | Merge "Check for the presence of accel and magnetometer sensors before ↵Chenjie Luo2015-07-221-2/+8
| | |\ \ \ | | | |/ / | | |/| | | | | | | adding AOSP fusion sensors." into mnc-dev
| | | * | Check for the presence of accel and magnetometer sensors before adding AOSP ↵Aravind Akella2015-07-201-2/+8
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | fusion sensors. Bug: 22502485 Change-Id: I3d9018649302b98004e4e216b2173e8411a08501
* | | | am 5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as ↵Michael Wright2015-07-230-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointer gestures." into cw-d-mr1-dev * commit '5ea7ea44a23d0ab81f24eb290840db10d766b122': DO NOT MERGE. Cancel touches as well as pointer gestures.
| * \ \ \ Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into ↵Michael Wright2015-07-232-3/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | cw-d-mr1-dev
| | * | | | DO NOT MERGE. Cancel touches as well as pointer gestures.Michael Wright2015-07-202-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19264992 Change-Id: If48e0953b972c9d69f516906adf7c6faf67e3eb8
* | | | | | am e6406e35: (-s ours) Check for the presence of accel and magnetometer ↵Aravind Akella2015-07-220-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Check for the presence of accel and magnetometer sensors before adding AOSP ↵Aravind Akella2015-07-221-2/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fusion sensors. DO NOT MERGE Bug: 22502485 Change-Id: I3d9018649302b98004e4e216b2173e8411a08501 (cherry picked from commit f504789dd3b3073de176fd2fa09dd9fc9de5bc1f)
* | | | | am a6364e25: am f892f914: Merge "omx: fix structure sizes to be the same on ↵Lajos Molnar2015-07-211-10/+18
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 32 and 64-bit builds" into mnc-dev * commit 'a6364e257d6b0be3c94819cd16fffa2d4d7c8150': omx: fix structure sizes to be the same on 32 and 64-bit builds
| * | | | am f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit ↵Lajos Molnar2015-07-211-10/+18
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | builds" into mnc-dev * commit 'f892f9141721a3805d18da2db0e1c17f1a99feb0': omx: fix structure sizes to be the same on 32 and 64-bit builds
| | * | | Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into ↵Lajos Molnar2015-07-211-10/+18
| | |\ \ \ | | | | | | | | | | | | | | | | | | mnc-dev
| | | * | | omx: fix structure sizes to be the same on 32 and 64-bit buildsLajos Molnar2015-07-211-10/+18
| | | | |/ | | | |/| | | | | | | | | | | | | | | | Bug: 22512621 Change-Id: I2100b8aad0a1cf110936f4a765718ba97f3d8ce7
* | | | | am 9ca52e34: am a2307aef: Only restorecon_data once for all users.Jeff Sharkey2015-07-211-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9ca52e34f742f6b8da936733626c334260c6edc8': Only restorecon_data once for all users.
| * | | | am a2307aef: Only restorecon_data once for all users.Jeff Sharkey2015-07-201-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'a2307aefd06f1310660ef1d35ce01bcfc72c9633': Only restorecon_data once for all users.
| | * | | Only restorecon_data once for all users.Jeff Sharkey2015-07-201-4/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 59d6f2c3: am 5f920c1a: BufferQueueConsumer: signal onFrameReleased on ↵Lajos Molnar2015-07-171-129/+142
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | dropped frames * commit '59d6f2c322080c5fee214ba2401ab271fd0440f7': BufferQueueConsumer: signal onFrameReleased on dropped frames
| * | | am 5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped framesLajos Molnar2015-07-171-129/+142
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5f920c1a2cf12c0638c05fbddee8ff6c1193731c': BufferQueueConsumer: signal onFrameReleased on dropped frames
generated by cgit v1.1 at 2025-08-05 01:38:41 +0000