summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-8.1.0_r74' into staging/lineage-15.1_merge-android-8.1.0_r74lineage-15.1Kevin F. Haggerty2020-03-021-0/+1
|\
| * default drm hidl: Fix decrypt destination base ptrRobert Shih2020-01-101-0/+1
* | Merge tag 'android-8.1.0_r70' into staging/lineage-15.1_merge-android-8.1.0_r70Kevin F. Haggerty2019-11-121-4/+31
|\|
| * default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE]Robert Shih2019-09-181-4/+31
* | Merge remote-tracking branch 'aosp/oreo-mr1-security-release' into lineage-15.1Kevin F. Haggerty2019-08-121-12/+112
|\|
| * cas: do not use hidl_memory if size is > SIZE_MAXChong Zhang2018-05-151-11/+18
| * cas: fix UAF in descrambler -- DO NOT MERGEChong Zhang2018-04-174-58/+73
| * cas: validate shared buffer size before usingChong Zhang2018-01-021-1/+52
| * Add tests to validate key length for clearkey plugin.Edwin Wong2017-11-281-12/+112
* | Merge tag 'android-8.1.0_r36' into staging/lineage-15.1-android-8.1.0_r36Luca Stefani2018-07-061-11/+18
|\ \
| * \ Merge cherrypicks of [4314166, 4314167, 4314168, 4314169, 4314462, 4314463, 4...android-build-team Robot2018-06-114-58/+80
| |\ \
| | * | cas: do not use hidl_memory if size is > SIZE_MAXChong Zhang2018-06-111-11/+18
| | * | cas: fix UAF in descrambler -- DO NOT MERGEChong Zhang2018-06-114-58/+73
| |/ /
* | | Merge tag 'android-8.1.0_r30' into lineage-15.1Sam Mortimer2018-06-104-58/+73
|\ \ \
| * \ \ Merge cherrypicks of [4027705, 4027707, 4027735, 4027736, 4026840, 4025434, 4...android-build-team Robot2018-05-084-58/+73
| |\ \ \ | | |/ / | |/| |
| | * | cas: fix UAF in descrambler -- DO NOT MERGEChong Zhang2018-05-084-58/+73
| |/ /
| * | Snap for 4527419 from 7de62777a0cd81c067c60032a9ed0a240f6fbe36 to oc-m2-releaseandroid-build-team Robot2018-01-051-1/+52
| |\ \
| * \ \ Snap for 4420879 from 3d522614ec13d9d3911a81789c6776332b82cb43 to oc-m2-releaseandroid-build-team Robot2017-10-311-25/+43
| |\ \ \ | | | |/ | | |/|
| * | | Snap for 4417144 from 6f11e984b1373c22a1601d95b4fe647271479929 to oc-m2-releaseandroid-build-team Robot2017-10-262-4/+4
| |\ \ \
| * \ \ \ Snap for 4402310 from fe1889be98ecd783acb5955b684352d5e0714821 to oc-m2-releaseandroid-build-team Robot2017-10-1818-62/+144
| |\ \ \ \
| * \ \ \ \ Snap for 4386615 from 9fd500490010bf10238840bcb2b3e9e6dced5207 to oc-m2-releaseandroid-build-team Robot2017-10-111-7/+5
| |\ \ \ \ \
| * \ \ \ \ \ Snap for 4384531 from eb92c84f6fd2e7312f43b51d652642d008cef7dc to oc-m2-releaseandroid-build-team Robot2017-10-0935-1994/+3442
| |\ \ \ \ \ \
| * \ \ \ \ \ \ release-request-99856c15-b008-4977-9971-f86523a23c0a-for-git_oc-m2-release-43...android-build-team Robot2017-09-2913-230/+622
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ release-request-a84b3435-75fa-41e8-bd3c-ca0f4cbd5cc5-for-git_oc-m2-release-43...android-build-team Robot2017-09-2176-1016/+3982
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ release-request-dabd8cf7-7af2-48e9-a296-ccc6a71cc25d-for-git_oc-m2-release-43...android-build-team Robot2017-09-1234-90/+172
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | camera: Only link and use vendor.qti.hardware.camera.device if specifiedRashed Abdel-Tawab2018-03-244-4/+36
* | | | | | | | | | | Camed HAL extension: Added support in HIDL for Extended FD.Sauhard Pande2018-02-104-24/+73
* | | | | | | | | | | Merge tag 'android-8.1.0_r11' into android-8.1.0_r11staging/lineage-15.1Dan Pasanen2018-02-051-1/+52
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge cherrypicks of [3365569, 3365570, 3366860, 3366878, 3365571, 3365572, 3...android-build-team Robot2017-12-141-1/+52
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | cas: validate shared buffer size before usingChong Zhang2017-12-141-1/+52
| |/ / / / / / / / /
* / / / / / / / / / wifi: Handle errors other than wifi_error enum.Purushottam Kushwaha2017-12-051-0/+4
|/ / / / / / / / /
* | | | | | | | | Merge cherrypicks of [3134552, 3130583, 3131953, 3131954, 3131955, 3131956, 3...android-build-team Robot2017-10-271-25/+43
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Don't expect stopOffload to succeed if interface doesn't exist.Lorenzo Colitti2017-10-271-25/+43
|/ / / / / / / /
* | | | | | | | Snap for 4411005 from d97f8714f07a762efe5a48747454fb4bdd51be8b to oc-mr1-releaseandroid-build-team Robot2017-10-232-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixup netlink socket creation to make corresponding fix in JNIErik Kline2017-10-202-4/+4
* | | | | | | | | Snap for 4404534 from a555e04f8c37db86c5016218d5b7ab37cccc29c6 to oc-mr1-releaseandroid-build-team Robot2017-10-190-0/+0
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix VTS test which turns off radio. am: 536818d17aSanket Padawe2017-10-180-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Fix VTS test which turns off radio.Sanket Padawe2017-10-181-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix VTS test which turns off radio.Sanket Padawe2017-10-181-1/+1
* | | | | | | | | | Snap for 4402249 from b70f1bda1f34fd63a9c9f5ad8307c8677a2f1f4d to oc-mr1-releaseandroid-build-team Robot2017-10-1810-11/+56
|\| | | | | | | | |
| * | | | | | | | | Merge "Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests" into oc-mr1-devTreeHugger Robot2017-10-185-11/+36
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts testssqian2017-10-175-11/+36
| * | | | | | | | | | Merge "bug fix: during fatal fails bypass freeNode() calls" into oc-mr1-devTreeHugger Robot2017-10-175-0/+20
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | bug fix: during fatal fails bypass freeNode() callsRam Mohan M2017-10-175-0/+20
* | | | | | | | | | | Snap for 4399693 from 15e945976b2d8a7047c2a8b87fd639c97423cf51 to oc-mr1-releaseandroid-build-team Robot2017-10-171-1/+8
|\| | | | | | | | | |
| * | | | | | | | | | tetheroffload VTS: fix stopOffload test conditionsErik Kline2017-10-161-1/+8
* | | | | | | | | | | Snap for 4393674 from 213c36d71d099b53e9846d320968a36d56b12ef3 to oc-mr1-releaseandroid-build-team Robot2017-10-131-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | Enlarge buffer size for direct report testing am: 3c01fef56cPeng Xu2017-10-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Enlarge buffer size for direct report testingPeng Xu2017-10-121-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Enlarge buffer size for direct report testingPeng Xu2017-10-121-1/+1