summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Initialize local variables to avoid data leakandroid-cts-6.0_r2android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2Naveen Leekha2015-09-281-1/+1
| | | | | | | | | | | | | | | | The uninitialized local variables pick up whatever the memory content was there on stack. This data gets sent to the remote process in case of a failed transaction, which is a security issue. Fixed. (Partial manual merge of master change 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest to automerge from klp-dev) For b/23696300 Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
* Add body sensors app op for custom sensorsandroid-cts-6.0_r1android-6.0.0_r1Prashant Malani2015-09-031-0/+4
| | | | | | | | If the custom sensor requires the BODY SENSOR permission, we should add the body sensors app op for the custom sensor Bug: 23396558 Change-Id: I132917d1bca12c76c8a9fb146e00951cba3e6d7a
* Add XML for pro audio featureGlenn Kasten2015-08-281-0/+22
| | | | | Bug: 23604253 Change-Id: I480cf0a46c286badc6fd95a3b42e6cb1ed056b1b
* merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-120-0/+0
|\
| * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-080-0/+0
| |\
| | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-040-0/+0
| | |\
| | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-010-0/+0
| | | |\
| | | | * Revert "Bug fix in SensorManager."Narayan Kamath2015-07-292-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 869eb2089ec8a6286b944bfcff57e4cbe0c7e207. Change-Id: I4fb865e3b18bbb011fa4e4b4732336930c3a45ae
| | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-290-0/+0
| | | | |\
| | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-250-0/+0
| | | | | |\
| | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-220-0/+0
| | | | | | |\
| | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-210-0/+0
| | | | | | | |\
| | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-180-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-150-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-140-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-080-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-070-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-010-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Fix directory path of codecache.Daichi Hirono2015-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously installd removed the normal cache directory when delete_code_cache is called. It should delete the code cache directory. BUG=21206499 Change-Id: I5774430e389e22805fa7984b4c83420c3677ca75
| | | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-270-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Fix crash in SensorService. Ignore devices with no sensors.Aravind Akella2015-06-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1491740baa6348f97c336b6883b11ad2ab93cf73
| | | | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-240-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-230-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-160-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-150-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-130-0/+0
| | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-110-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-100-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-090-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-060-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * | Revert "Modify EGL to disconnect the window when the surface gets destroyed."Michael Lentine2015-05-282-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00699fa64197cc72a160d69e1f0003cdd43dc136.
| | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | Fix broken NDK sensor manager API.Svet Ganov2015-05-072-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21bb8b0dcfd3f1c812753a9fd77dea792e7155f2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | libgui: Clear frame number while freeing slotDan Stoza2015-05-042-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clears the frame number of a slot when it is freed, since it is used to determine if a released buffer is stale. Bug: 20445852 Change-Id: I02415e7b25a1eafe7414d6eb1cedf62ac5543cd9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Add new media navigation keys.Michael Wright2015-08-072-1/+9
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22059484 Change-Id: I587eb7622555194f18f403da583e3b70656a530e
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Bug fix in SensorManager."" into mnc-devNarayan Kamath2015-07-292-11/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |