summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Cherry-pick: Add callback-based support for HW Activity Recognition.destradaa2015-08-242-1/+39
* Import translations. DO NOT MERGEGeoff Mendal2015-08-242-25/+25
* am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating ...Eino-Ville Talvala2015-08-221-0/+2
|\
| * Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces"...Eino-Ville Talvala2015-08-221-0/+2
| |\
| | * Camera2: Legacy: Lock down surface sizes before creating EGL surfacesEino-Ville Talvala2015-08-211-0/+2
* | | am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-devEino-Ville Talvala2015-08-223-21/+34
|\ \ \ | |/ /
| * | Merge "Camera: Fix depth documentation issues" into mnc-devEino-Ville Talvala2015-08-223-21/+34
| |\ \
| | * | Camera: Fix depth documentation issuesEino-Ville Talvala2015-08-193-21/+34
* | | | am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into...Fyodor Kupolov2015-08-211-1/+2
|\ \ \ \ | |/ / /
| * | | Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-devFyodor Kupolov2015-08-211-1/+2
| |\ \ \
| | * | | Fixed a typo in convertRestrictionsToBundle JavaDocFyodor Kupolov2015-08-211-1/+2
* | | | | am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-devJim Miller2015-08-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix type-o in FingerprintManager documentation" into mnc-devJim Miller2015-08-211-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix type-o in FingerprintManager documentationJim Miller2015-08-201-1/+1
| | |/ /
* | | | Merge "Add support for new window orientation sensor." into mnc-dr-devTrevor Bunker2015-08-212-0/+12
|\ \ \ \
| * | | | Add support for new window orientation sensor.Michael Wright2015-08-202-0/+12
* | | | | Add StrongAuthTrackerAdrian Roos2015-08-215-41/+213
* | | | | am cb59747d: Merge "Add missing removed permissions to the platform manifest"...Svetoslav Ganov2015-08-211-0/+40
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Add missing removed permissions to the platform manifest" into mnc-devSvetoslav Ganov2015-08-211-0/+40
| |\ \ \ \
| | * | | | Add missing removed permissions to the platform manifestSvet Ganov2015-08-201-0/+40
* | | | | | am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-devFyodor Kupolov2015-08-201-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed key comparison in equals methodFyodor Kupolov2015-08-201-1/+1
| | |_|/ / | |/| | |
* | | | | am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-devJeff Sharkey2015-08-201-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Pass underlying volume UUID to StorageVolume." into mnc-devJeff Sharkey2015-08-201-1/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Pass underlying volume UUID to StorageVolume.Jeff Sharkey2015-08-191-1/+3
* | | | | am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t h...Lorenzo Colitti2015-08-191-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Don't mark NetworkRequests restricted when they don't have restricted ...Lorenzo Colitti2015-08-191-1/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Don't mark NetworkRequests restricted when they don't have restricted capsPaul Jensen2015-08-191-1/+5
* | | | | Merge "Camera2: Handle surface size change" into mnc-dr-devChien-Yu Chen2015-08-191-6/+22
|\ \ \ \ \
| * | | | | Camera2: Handle surface size changeChien-Yu Chen2015-08-181-6/+22
* | | | | | am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batt...Dianne Hackborn2015-08-191-1/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix issue #23326715: Clarify --checkin/-c options in batterystatsDianne Hackborn2015-08-181-1/+0
| | |/ / / | |/| | |
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-194-119/+119
* | | | | Reset fingerprint lockout timer when strong auth is used.Jim Miller2015-08-183-0/+27
| |/ / / |/| | |
* | | | am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mn...Sebastien Hertz2015-08-181-6/+10
|\ \ \ \ | |/ / /
| * | | Merge "Allow debugging only for apps forked from zygote" into mnc-devSebastien Hertz2015-08-181-6/+10
| |\ \ \
| | * | | Allow debugging only for apps forked from zygoteSebastien Hertz2015-08-101-6/+10
* | | | | am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020...Amit Mahajan2015-08-171-0/+21
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-devAmit Mahajan2015-08-171-0/+21
| |\ \ \ \
| | * | | | Setting config_use_sim_language_file to false for 334-020.Amit Mahajan2015-08-121-0/+21
* | | | | | am 757e2c7f: Merge "Fix documentation issue" into mnc-devJorim Jaggi2015-08-171-3/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Fix documentation issueJorim Jaggi2015-08-171-3/+0
* | | | | Merge "Add experimental camera session prepare API." into mnc-dr-devRuben Brunk2015-08-176-0/+86
|\ \ \ \ \
| * | | | | Add experimental camera session prepare API.Ruben Brunk2015-08-146-0/+86
* | | | | | Merge "instrument fingerprint service" into mnc-dr-devChris Wren2015-08-171-0/+15
|\ \ \ \ \ \
| * | | | | | instrument fingerprint serviceChris Wren2015-08-141-0/+15
* | | | | | | am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enum...Esteban Talavera2015-08-171-6/+20
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "Remove uids with empty history from NetworkStats uid enumeration" into...Esteban Talavera2015-08-171-6/+20
| |\ \ \ \ \ \
| | * | | | | | Remove uids with empty history from NetworkStats uid enumerationZoltan Szatmary-Ban2015-08-141-6/+20
* | | | | | | | am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc...Eino-Ville Talvala2015-08-163-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /