summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-03Disable copying of Mali RS driver binariesandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseTim Klein
am: 552594b681 Change-Id: Ib03962de9727c3a3400fc498520f8674d4a77864
2019-06-03Disable copying of Mali RS driver binariesandroid10-devTim Klein
This is temporary and required due to conflicts in the names used by the Mali RS driver binaries and AOSP binaries. Bug: 131709055 Test: manual Change-Id: Ia1509cb4d12267f35f1e85e2494628140b2881b8 (cherry picked from commit c85f9bbdd96e03e0532932c0a6954559fd8c11b6)
2019-04-25Modify gralloc0 implementationValerie Hau
Add validateBufferSize and getTransportSize Bug: 131089111 Test: build, boot Change-Id: I1eb01fe01af5b0f6b6d3dbccd522eb73bd436053
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
am: 2f14ae8a5e Change-Id: I46e95ab746dddcb13c6d060c1896abaa550065da
2019-04-03Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur
am: d7519bdaa9 Change-Id: I340e38f4d6ab53138af15e94fee03c3960eaf2e6
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I2dc24e4a57e8633e5042039292e7486a2eda69d9 BUG: 129345239
2019-03-29Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960 am: b5fc0cb2f3 am: ↵Colin Cross
3455f409f1 am: 704d76a00a Change-Id: Ieddaa83faf9166329a39b55b4b16e0897c6bdca4
2019-03-29Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960 am: b5fc0cb2f3Colin Cross
am: 3455f409f1 Change-Id: I17402bcf858b8c7f1c94ba53f2bc69985c6e34fa
2019-03-29Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960Colin Cross
am: b5fc0cb2f3 Change-Id: Ie47e22a829738fd3e01fc73b0236d05c0c414a1d
2019-03-29Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5Colin Cross
Prevent external/drm_hwcomposer from referencing device/linaro/hikey, which may not exist in all trees, by compiling most of drm_hwcomposer as a static library and then compiling just the source files that are affected by device-specific #defines and #includes in device/linary/hikey/gralloc*. Fixes: 129543119 Test: m hwcomposer.drm_hikey hwcomposer.drm_hikey960 MODULES-IN-external-drm_hwcomposer Change-Id: Idaac809ba271b27998f89c877ede46def9a417a4
2019-03-29Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I683fd56f428a7914d99b80994e83ac3bb093ab4d BUG: 129345239
2019-03-27Merge "Use different hwcomposer HALs for hikey and hikey960" am: 5ba6c593c0 ↵Alistair Strachan
am: 8638c8a3ec am: 5a8f63ffe3 Change-Id: I45ad5f9397cce75be60d1efcdf860da285409db5
2019-03-27Merge "Use different hwcomposer HALs for hikey and hikey960" am: 5ba6c593c0Alistair Strachan
am: 8638c8a3ec Change-Id: I8f529daace175e53cf20d07a6aa806bf3e8c275a
2019-03-27Merge "Use different hwcomposer HALs for hikey and hikey960"Alistair Strachan
am: 5ba6c593c0 Change-Id: Ibde3d4d8a98f3d73db1b0862328f3844138b2c07
2019-03-27Merge "Use different hwcomposer HALs for hikey and hikey960"Alistair Strachan
2019-03-23Use different hwcomposer HALs for hikey and hikey960Colin Cross
Instead of conditionally compiling hwcomposer.drm for hikey and hikey960, compile two different modules and selectively use them on hikey and hikey960. Bug: 122332597 Test: none Change-Id: Ifcb64798bc34101d9e1f851454c3fe361c478c12
2019-03-22Use the exposed librecovery_ui in device specific recovery code am: ↵xunchang
95a20ef47a am: 182634e946 am: 218bbf3186 Change-Id: I223c3c777ea400c84ccf1e23c9b7ee6fb354048a
2019-03-22Use the exposed librecovery_ui in device specific recovery code am: 95a20ef47axunchang
am: 182634e946 Change-Id: If4b5b3d30d92f39a9c2c6caaa00140e53731aaf6
2019-03-22Use the exposed librecovery_ui in device specific recovery codexunchang
am: 95a20ef47a Change-Id: Ica6afcfbf96113b9daed7ee39cb41c1ff5bf8b30
2019-03-21Use the exposed librecovery_ui in device specific recovery codexunchang
Use the librecovery_ui as shared library instead of including bootable/recovery. Bug: 76436783 Test: mma Change-Id: Id7f87c14db6c44685acd1d153f42d1b059e3582e (cherry picked from commit 73c3b397a4af925b93c3815416817050416f003c)
2019-03-21Merge "Use the exposed librecovery_ui in device specific recovery code"Tianjie Xu
2019-03-20Use the exposed librecovery_ui in device specific recovery codexunchang
Use the librecovery_ui as shared library instead of including bootable/recovery. Bug: 76436783 Test: mma Change-Id: Id7f87c14db6c44685acd1d153f42d1b059e3582e
2019-03-20Merge "hikey960: Fix rtc0 hwtosys selinux denial" am: 78c597e279 am: 886d61a351John Stultz
am: 6fee327d60 Change-Id: I1d3990f316f710f44bd8b9c7efec64537ba1b798
2019-03-20Merge "hikey960: Fix rtc0 hwtosys selinux denial" am: 78c597e279John Stultz
am: 886d61a351 Change-Id: I5785086c8de1a8ad87aa5bbfbaf426260cc684ee
2019-03-20Merge "hikey960: Fix rtc0 hwtosys selinux denial"John Stultz
am: 78c597e279 Change-Id: I5bef0a0a11e52b4ccfddeb39923e8a6ed6dd7c0e
2019-03-20Merge "hikey960: Fix rtc0 hwtosys selinux denial"Treehugger Robot
2019-03-19HACK: hikey/hikey960: Disable nonblocking_ffs to avoid recent crashes with ↵John Stultz
adbd am: cadc87f48b am: 4399836953 am: a7bf1c2f0b Change-Id: I62e5731ba63cb30a380896ab800d0bcec1d43a9c
2019-03-19HACK: hikey/hikey960: Disable nonblocking_ffs to avoid recent crashes with ↵John Stultz
adbd am: cadc87f48b am: 4399836953 Change-Id: Ib40951a420d88f5c7c9a76b1774816911291e32c
2019-03-19HACK: hikey/hikey960: Disable nonblocking_ffs to avoid recent crashes with adbdJohn Stultz
am: cadc87f48b Change-Id: I232cfdb6ac55af2b835a33a082bd594886f39769
2019-03-18HACK: hikey/hikey960: Disable nonblocking_ffs to avoid recent crashes with adbdJohn Stultz
Recent changes to adbd have enabled nonblocking_ffs by default. These have seeminly uncovered some bad memory corruption in the kernel ffs gadget driver on every kernel I've tried so far. Unfortunately I've not been able to diagnose what is going wrong, so for now, lets disable the nonblocking_ffs. We still need to root cause the issue as its a problem even with the mainline kernel on HiKey, so its likely a generic kernel issue. Change-Id: I7a0797cc9e8e5f263e533beea23642f768c0f017 Signed-off-by: John Stultz <john.stultz@linaro.org>
2019-03-15hikey960: Fix rtc0 hwtosys selinux denialJohn Stultz
Noticed the audit denial on rtc hwtosys file: 01-01 03:50:51.146 2877 2877 W system_server: type=1400 audit(0.0:13): avc: denied { read } for name="hctosys" dev="sysfs" ino=14546 scontext=u:r:system_server:s0 tcontext=u:object_r:sysfs:s0 tclass=file permissive=0 So added this sepolicy change to address it. Change-Id: Ie1302cf15eaee63f395c34a16352e60152eb0bf0 Signed-off-by: John Stultz <john.stultz@linaro.org>
2019-03-12Enable Bluetooth Audio HAL 2.0 for hikey am: 723ccc2845 am: 69e33b87a9Jack He
am: 1f92125d5b Change-Id: I0472e2d2cf831140dc5366f1534a7291c4e44151
2019-03-12Enable Bluetooth Audio HAL 2.0 for hikey am: 723ccc2845Jack He
am: 69e33b87a9 Change-Id: Ifb26d624c985c124c1a2e73d4a090722a971cd08
2019-03-12Enable Bluetooth Audio HAL 2.0 for hikeyJack He
am: 723ccc2845 Change-Id: Ia5d6fff368f404273e48921795c4949023c7e1d3
2019-03-12Enable Bluetooth Audio HAL 2.0 for hikeyandroid-q-preview-1android-o-mr1-iot-release-1.0.10Jack He
Bug: 111519504 Test: boot, VTS Change-Id: I5168bb831579ab1d8789addfb2cb0f479795b16f
2019-03-04hikey: gralloc: Add element to allow upstream drm_hwc to build w/ HiKey am: ↵John Stultz
91d8213c92 am: 7da3a9ecf0 am: 6436a7d259 Change-Id: I5c7f632fd02544de12905fe629f653ae38b334b4
2019-03-04hikey: gralloc: Add element to allow upstream drm_hwc to build w/ HiKey am: ↵John Stultz
91d8213c92 am: 7da3a9ecf0 Change-Id: Id3cceb99fb63261af1e2042fc6380846c346fd93
2019-03-04hikey: gralloc: Add element to allow upstream drm_hwc to build w/ HiKeyJohn Stultz
am: 91d8213c92 Change-Id: I3d21b0a8e7c6f9a9f31e2f8c4368b99b5323caea
2019-02-28hikey: gralloc: Add element to allow upstream drm_hwc to build w/ HiKeyJohn Stultz
Upstream drm_hwc merged some changes to support AFBC which is only supported on HiKey960. In doing so they utilize a hikey960 gralloc private handle field that doesn't exist on HiKey. Thus this patch adds the internal_format field as a union element on format. This is a union element so we don't change the structure size and since internal_format isn't used in drm_hwc when building with w/ HiKey there is no effect on the values it aliases. Change-Id: Ie73706d8f3acfaf3bfa5c187c0365d505da044d2 Signed-off-by: John Stultz <john.stultz@linaro.org>
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 11e44413f4 Change-Id: I3ecf6fff2f6d1db38a1e19af1bf42b5ee60aabfb
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Iba17a0c46bb84fd980f7f4a45346ec871ec18cf1
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I4fea88387af1efa56dc29c688041ecc782b49f19
2019-02-17Fix errors found by prebuilt ELF checker am: 35a7a37667 am: a3c1307ebaLogan Chien
am: f948d5af61 Change-Id: I425c85e2fb8462dcc4b157075c637c747de369aa
2019-02-17Fix errors found by prebuilt ELF checker am: 35a7a37667Logan Chien
am: a3c1307eba Change-Id: I1ac4e4ae11bde0e4206325d8aaa7e41246603fe6
2019-02-17Fix errors found by prebuilt ELF checkerLogan Chien
am: 35a7a37667 Change-Id: I5c0c03836ecf7cbee9a9707dd88b50f90618c42f
2019-02-14Fix errors found by prebuilt ELF checkerLogan Chien
This commit fixes several errors that are found by prebuilt ELF checker: * Add missing LOCAL_SHARED_LIBRARIES for prebuilt binaries * Add `LOCAL_CHECK_ELF_FILES := false` to bypass checks on `libbccArm.so` and `vulkan.hikey960.so`. Bug: 119086738 Test: lunch hikey960-userdebug && \ CHECK_ELF_FILES=true make check-elf-files Change-Id: I173a47b95c9dc3111e5dfc1f2e5da1865b65311f
2019-02-05HiKey960: Set driver_match_existing_only to 0 to enable gadget mode to work ↵John Stultz
on usb-c hotplug am: f80ca2ba9c am: 91535c5109 am: f8b7b0e52f Change-Id: Iff8a86e684f0a1fe296c578493bae4c576a3fddf
2019-02-05HiKey960: Set driver_match_existing_only to 0 to enable gadget mode to work ↵John Stultz
on usb-c hotplug am: f80ca2ba9c am: 91535c5109 Change-Id: Id6af763d2eb07408a57416309613b4b726dec479
2019-02-05HiKey960: Set driver_match_existing_only to 0 to enable gadget mode to work ↵John Stultz
on usb-c hotplug am: f80ca2ba9c Change-Id: Id2310f284cc4489033e12b8717f5d857e3aaecb3
2019-02-04HiKey960: Set driver_match_existing_only to 0 to enable gadget mode to work ↵John Stultz
on usb-c hotplug With the upstream targetted patches, if the system boots up and the usb-c cable is unplugged, when it is plugged in the system will not fully switch to gadget mode, causing adb to fail. This is due to the gadget enumerating on a different device number then what is expected. Thus this patch sets driver_match_existing_only to 0 to allow the new number to be used. Also updates init.recovery.common.rc file Suggested by: Chen Yu <chenyu56@huawei.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I217653edc013f888feb8d97220e466903834607b