summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-20sdm660-common: doze: Fix dark theme issuesBruno Martins
This brings SwitchBar widget inline with 10 and fixes the theme issues when the dark mode is enabled. Change-Id: I6909b77bc649eb9eb760bf01b46f66570363e9d9
2020-12-18Revert "sdm660-common: doze: Follow Android 10 changes on switchbar"Michael Bestas
* Will be replaced by a different commit This reverts commit e3000073ee3ced9416f6b06cb09e220519e8a692. Change-Id: I8de333c7953f020e033e23fc8b2594d28b3f1b9b
2020-12-18sdm660-common: overlay: Update pinner list for new SystemUI locationSubhajeet Muhuri
Change-Id: I93c1a4b73ca1f03ca0fcf9cbe4ce1b057a739ca6
2020-12-18sdm660-common: overlay: Update paths to the new ART APEX.Martin Stjernholm
Test: Presubmits Bug: 135753770 Change-Id: I98378100456dce927ccc253301a398d70d1b7368
2020-12-18sdm660-common: overlay: Update in pinned files.Nicolas Geoffray
Remove or update paths that don't exist. Bug: 119800099 Test: boots Change-Id: Ib2cea88499cf08274d620d9d85ffcafc31fee868
2020-12-18sdm660-common: overlay: Pin missing files as of Google's settingsDavide Garberi
Change-Id: Ib79cef0b15bede4270ae1c1a62e9cc6182bf4631
2020-12-18sdm660-common: load_system_props is deprecated and causes a build error.Divya Sharma
Change-Id: I71df37c605ed805dc1f8bc2e626a33cf6818e9f7
2020-12-18sdm660-common: Replace BOARD_CHARGER_DISABLE_INIT_BLANK with equivalent propBruno Martins
Change-Id: I00125a429cde213e8dd22f742c5875e39b80bb5e
2020-12-18sdm660-common: Replace BOARD_CHARGER_ENABLE_SUSPEND with ↵Yifan Hong
ro.charger.enable_suspend Test: charger mode Bug: 124118169 Change-Id: I3825d08e38d677bd7154879609857de302348b6f
2020-12-18sdm660-common: Remove gnss hidl entries in manifest.xmlYingjie Wang
Remove all android.hardware.gnss entries in manifest.xml, since these manifest fragments are moved to gps git projects. Change-Id: Ieb3b0b4244ff075ba254d2e3ad1209c92fd3a4d6 CRs-fixed: 2548467
2020-12-18sdm660-common: Remove usb hidl entry from manifest.xmlArian
Change-Id: I105e682daec37c5663592b3955565d46cdbc6f11
2020-12-18sdm660-common: Remove vintf entries that are now fragmentsLuK1337
Change-Id: I22b105b1340dff648bc5011b80f735b33d5fe370
2020-12-18sdm660-common: Enable v1.3 clearkey drm pluginRobert Shih
Bug: 139134043 Test: MediaDrmTest Change-Id: Ie34e59947577988f75fae52d22e3f573f4b92420 Signed-off-by: Arian <arian.kulmer@web.de>
2020-12-18sdm660-common: Move wpa_supplicant VINTF definition to wpa_supplicant moduleJimmy Chen
Bug: 36505680 Test: atest FrameworksNetTests Test: atest VtsHalWifiSupplicantV1_3TargetTest Test: connect EAP access point and verify PMK cache works correctly. Change-Id: I2c382765b8e84951fc17bb9f1c3785dcd66e7b51
2020-12-18sdm660-common: Move supplicant service init to wpa_supplicantJimmy Chen
Bug: 138790309 Test: boot and wifi function is ok Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4
2020-12-18sdm660-common: Add supplicant 1.2 to init.qcom.rcHai Shalom
Add missing supplicant 1.2 to init.qcom.rc to xiaomi_sdm660-common project. Bug: 129693419 Test: lshal Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalWifiSupplicantV1_2Host Change-Id: I34577cac4892563774f035d3a68ed17cc1edeeb9
2020-12-18sdm660-common: Remove hostapd hidl entry from manifest.xmllesl
This CL removes the definition for the hostapd hidl interface from manifest.xml and rely on vint-fragements entry. This is to avoid the need to modify the revision in future Bug: 145780363 Test: builds and wifi softap works Change-Id: I2b0d28b143e232ce60c56cbabfed3f685ab6bab9
2020-12-18sdm660-common: Remove IWifi hidl entry from manifest.xmlAhmed ElArabawy
This CL removes the definition for the IWifi hidl interface from manifest.xml and rely on vint-fragements entry. This is to avoid the need to modify the revision in future Bug: 138243400 Test: builds and wifi works Change-Id: Id36fb384bbbf55a976d315d6a374d5fb66f4e1bb
2020-12-18sdm660-common: Switch to Audio HAL V6Mikhail Naganov
Switch to Audio HAL V6 Bug: 141989952 Test: atest VtsHalAudioV6_0TargetTest atest VtsHalAudioEffectV6_0TargetTest manual audio "smoke" test on taimen and walleye Change-Id: Ieb1cc5c7fdcc5416a328a0a5c4a1996258b81ac8
2020-12-18sdm660-common: Switch vintf manifest from copy files to build targetsLuK1337
* Fixes: build/make/core/Makefile:49: error: VINTF metadata found in PRODUCT_COPY_FILES Change-Id: I0a7ddebff54563f7901b6ce5d6af9580ea201a77
2020-12-18Revert "sdm660-common: Use timeservice_app_cert-legacy-um certificate for ↵Davide Garberi
TimeService app" This reverts commit acc408ecf6f5fbccef4620b298289fff493ab78f. Change-Id: Iabb4f1e5ba3b7d7b599033cf063650db9525a5f4
2020-12-18sdm660-common: Update qcom sepolicy includeLuK1337
Change-Id: I7167575e82eb8c5de2d822643261757edda73a07
2020-12-18sdm660-common: Remove libhwbinder/libhidltransport depsSteven Moreland
Since these were combined into libhidlbase. Bug: 135686713 Test: build only (libhwbinder/libhidltransport are empty) Change-Id: Iba2cd20b8b20fac3e7564de6b853b475fd4ebd2a
2020-12-17sdm660-common: Update blobs from jasmine V11.0.17.0.QDIMIXMMichael Bestas
Change-Id: Ifabd69adf3babcbf3b03c1fedbda27422805568d
2020-12-17sdm660-common: Update soter service from jason V12.0.1.0.PCHCNXMdianlujitao
Change-Id: I60abe0fa45532a836e28b3ce3d796b3dffed5a30
2020-12-17sdm660-common: disable qemu.hw.mainkeys setpropErfan Abdi
We are enabling software navigation bar using overlay. Thus, this is not required. Not to mention, this causes SELinux denials as well. [ 8.853895] selinux: avc: denied { set } for property=qemu.hw.mainkeys pid=1262 uid=0 gid=0 scontext=u:r:qti_init_shell:s0 tcontext=u:object_r:default_prop:s0 tclass=property_service permissive=0 Signed-off-by: Erfan Abdi <erfangplus@gmail.com> Change-Id: I36473bb7b5e2c22cbc60b96d0fab0f4446314701
2020-12-17sdm660-common: Add missing qcril_database filesMichael Bestas
Change-Id: I0f203a2e17d0a9eb8e40b5475cb96e2b010b57bc
2020-12-17sdm660-common: overlay: Add missing WFC overlayMichael Bestas
Change-Id: I90f776949f4af778eecebbf3805d661925179980
2020-12-17sdm660-common: Add missing radio properties from stock jasmineMichael Bestas
Change-Id: If83444e1bada53d06bfcbf414a22ad3843aade81
2020-11-05Revert "sdm660-common: Exclude lineage-sdk overlays from RRO"Michael Bestas
This reverts commit 5c4622d9dfee8528c87401fd6f7e56ddb244c543. Change-Id: Ie764de9b4624fb62cf4689bf0bea3854301f97c2
2020-11-05Revert "sdm660-common: Exclude Snap overlays from RRO"Michael Bestas
This reverts commit 938bdfae0a0a69e765d39121ba18de111df28eaa. Change-Id: If66bcd3d1714e697884ab4a34382801db44c7b26
2020-11-05sdm660-common: Update Widevine HIDL service to 1.2.Edwin Wong
Widevine HIDL service added new v1.2 media APIs, update the service version to 1.2. Test: Netflix and Play Movies & TV (streaming and offline playback) Test: GTS WidevineH264PlaybackTests test e.g. ANDROID_BUILD_TOP= ./android-gts/toolsefed run gts -m GtsMediaTestCases --test com.google.android.media.gts.WidevineH264PlaybackTests#testL1With480P30 bug: 117570686 Change-Id: I59500a9ea6df45c98b17edb3343c5c4829c6434b
2020-10-27sdm660-common: Update blobs from jasmine V11.0.15.0.QDIMIXMMichael Bestas
Change-Id: I4af8b8e612c6ee28086c1ab604f4cc4402b17ab1
2020-10-18sdm660-common: Add AOSP RCS packagesEthan Chen
Change-Id: Ic16d3b92820d246db73ad70ccaa0f4bc7f50e515
2020-10-18sdm660-common: Remove dead RCS packagesEthan Chen
Change-Id: Ie2c03fa11cb08c7ab900d7b666981d592aba19c7
2020-10-09sdm660-common: Move rtc contexts to device/qcom/sepolicyNolen Johnson
* In device/qcom/sepolicy-legacy-um now. Change-Id: I80b877d4b65a3d22cf7a61d70e08e48edeb627de
2020-10-03sdm660-common: Update blobs from jasmine V11.0.14.0.QDIMIXMMichael Bestas
Change-Id: I3efc4456607f560a4dbea15d7cb51db57ed35998
2020-09-12sdm660-common: Update blobs from jasmine V11.0.13.0.QDIMIXMMichael Bestas
Change-Id: I15d7c656e7512b543f44d8184cfaf96513799d58
2020-09-12sdm660-common: Update manifest entry to power HAL 1.2Michael Bestas
It rolled back when manifest was updated from CAF Change-Id: Ie33315f8bf86b56bbea1bf6239f425b3a4c33470
2020-09-12sdm660-common: Drop duplicated FM blobErfan Abdi
* It’s already dependency of QTI bluetooth Change-Id: Ic27c07d3edc7e30a95e0af603ac35cce6710acc0
2020-09-12sdm660-common: Don’t modify default brightness on recoveryErfan Abdi
* it’s not 0-255 on this common tree phones, and 200 makes screen too dim Change-Id: I347dc55d6e5c7179f2b766c990cf68955b752e05
2020-09-12sdm660-common: Nuke deprecated bluetooth flagsErfan Abdi
Change-Id: Ifb145fbeef8146bb7246d49792ce3419065b6c92
2020-09-12sdm660-common: Set cpu "runtime variant" to cortex-a73Anton Hansson
This makes bionic and various art tools that compile/runs cpu-specific code choose the kryo variant at runtime. It does not affect build-time compilation. Bug: 120773446 Test: bionic benchmarks with and without this change Change-Id: I670c8acd094090135515688c5f057c2cc08a083f
2020-09-12sdm660-common: Use generic arch variantAnton Hansson
Follow blueline which has not demonstrated any regressions after switching to a generic arch variant. Bug: 120773446 Test: make Change-Id: I9e23963fcfa5ccaa912f2930a632458c4d2a692d
2020-09-12sdm660-common: Fix ims jni symlinks locationErfan Abdi
Change-Id: I0aeaed333768ad9c80aa599bafd59c270da8536c
2020-08-04sdm660-common: Update blobs from jasmine V11.0.12.0.QDIMIXMMichael Bestas
Change-Id: I832feea12cad838d21d21eaf7e8637e402cfc7b3
2020-07-31sdm660-common: light: Report the correct value in LCD fallback logDavide Garberi
Change-Id: Iff93b035ce99aeb8408de227dfcee6c7696fedfb
2020-07-11sdm660-common: Don't advertise vorbis offloading supportLuK1337
* Doesn't work at all. Change-Id: I10cd34c6e52e9c72f3089d3c5f479d5ea5532d86
2020-06-29sdm660-common: Update blobs from jasmine V11.0.11.0.QDIMIXMMichael Bestas
Change-Id: Ib36f632565951718d54e2048415a7023bb149a7a
2020-06-29sdm660-common: Increase audio HAL buffer size to 240Kim Le
Change-Id: I7dbba15539feb61bb34192c1b86cf224c4c8c2b2
2020-06-29sdm660-common: Import fp gesture keylayout edits for jasmine_sprout/wayneSubhajeet Muhuri
Change-Id: I47236dcc3c75f1abd09ce47546f4da2f33c5ee8e
2020-06-29sdm660-common: Remove keymap of headset buttonsdianlujitao
Change-Id: Ib64eb55a74e9ddfe53a0c0f8310cc0360c178d56
2020-06-27sdm660-common: Switch to QTI bt stack and enable a2dp offloaddianlujitao
Change-Id: I47016b066ae800d0071dbad6a1235cbc9db3cf80
2020-06-23sdm660-common: Wifi: enable P2P MAC randomizationJimmy Chen
Bug: 146398159 Test: enter Wi-Fi Direct and check p2p interface address is randomized. Change-Id: I5f03f907174d6eec2a739c9112fc2e8fad5ef0ae
2020-06-23sdm660-common: Enable connected MAC randomizationxshu
Bug: 122920200 Test: Verified feature works on device Change-Id: Ia3f58a44c2e072aaa6c711a9db37219626894c67
2020-06-23sdm660-common: Change USB autosuspend delay to 7s by commandline.Andrew Chant
b/71936484 has audio accessories failing to connect when there's a transition to suspend when they're attempting to enumerate. Avoid this problem by increasing autosuspend delay from the default 2s to 7s. The longest I've seen a device take to enumerate after vbus is ~3 seconds, this gives a 2x margin. Test: booted on Walleye, saw no more messages: [ 472.412555] c0 5675 msm-dwc3 a800000.ssusb: DWC3 in low power mode between device connection and enumeration. Bug: 71936484 Change-Id: Ic655f2ce6dec429510cc7c00452da4d49f2392b0
2020-06-08sdm660-common: Update blobs from jasmine V11.0.10.0.QDIMIXMMichael Bestas
Change-Id: I50fda7f45c8df3c3bc20f6bba567fcab06fcf9c5
2020-06-08sdm660-common: Remove unused FM blobsdianlujitao
Change-Id: I6ad69ef3558ef02d886050aefa6edcb07fd7e0c3
2020-06-01sdm660-common: Move AOSP overlays out of Lineage-specific folderMichael Bestas
Change-Id: I2ac22d8801cfa5281219009f3e86019a54ede269
2020-06-01sdm660-common: Remove config_tether_upstream_types overlayWang Han
* No need for it now as framework side handles this well on P Change-Id: I708663f3de23cf1677a81bf31e8fc5fed4145e1b
2020-06-01sdm660-common: Change wifi tether regexRoshan Pius
The wifi interface names for wifi can either be wlan0 or wlan1. Change the "config_tether_wifi_regexs" appropriately. Bug: 80375412 Bug: 118366147 Test: Ensured we display "Hotspot on" in settings when softap is started on either wlan0 or wlan1. Change-Id: I0c456412f9b71ef2ee784f3bfa58b01b9287ca73
2020-06-01sdm660-common: Fix battery light not lit after notification light offdianlujitao
Change-Id: Id4312627cfb4d26507bc78592a5952d909e7e04d
2020-06-01sdm660-common: media: Fix rank of QC OMX componentsSujin Panicker
Rank OMX SW codecs higher than C2 codecs except for opus codec. Change-Id: Ided16f454fcb3b760076500e87759bcbb44f75ed
2020-06-01sdm660-common: Remove unused lower-end codecsdianlujitao
Change-Id: Ia7172e12b388c02cf3e8a8034d8eaf5f20b911ca
2020-06-01sdm660-common: Checkout media_codecs_performance.xml from ↵dianlujitao
LA.UM.8.2.r1-06700-sdm660.0 Change-Id: I9c21a1cdc3c737708482836ea9fab1da8a021750
2020-06-01Revert "sdm660-common: Enable Codec2"dianlujitao
Enabled on Q by default. This reverts commit 9b99de7383e8f965c716596c0825e7c92ebff6dd. Change-Id: Ief25ca6d27e6d640e9134bcc3fbcf70f576c999a
2020-06-01sdm660-common: Add missing perfconfigstore.xmldianlujitao
Change-Id: I35cf35b61440e708b19f505e3444f79bf0f1dc0b
2020-06-01sdm660-common: Enable graphics mapper version 2.1Arvind Kumar
Enable graphics mapper version 2.1 Change-Id: Iad70754a980eadcfd68752c76e569b503d398fae
2020-06-01sdm660-common: Update display config to version 1.9Karthi Kandasamy
upgrade display config version to 1.9 Change-Id: I29586a29b2091366fa975c2721fe1e507e62a537 Signed-off-by: c_kartka <kartka@codeaurora.org>
2020-06-01sdm660-common: Disable PQ by default in encoderVasantha Balla
Disable PQ feature by default on sdm660 Change-Id: I42014b3897c2b817872d07b71412540093fa594e
2020-06-01sdm660-common: media: Added performance point tag for sdm660Sanjay Singh
Q version expects publishing of performance points. Change-Id: I32f3b720bf63ab034fcbc2bd8b91f5a54de3bbd3
2020-06-01sdm660-common: media: update opus omx codec rankingSujin Panicker
Update opus omx codec ranking to give c2 implementation higher priority. Change-Id: I5fb0c91fe0f8c691868c92eb50536495b31132e2
2020-05-28sdm660-common: add in whyred supportAkhil Narang
Signed-off-by: Akhil Narang <akhilnarang.1999@gmail.com> Change-Id: I6844feb7d7b50c4ee1508211fa8b346c1aa11a2a
2020-05-21sdm660-common: Remove unused keys from keylayoutsMichael Bestas
Change-Id: Iaa9d2e72d291f0013055e1493a0a5698b6ccc74e
2020-05-21sdm660-common: Disable ALMK and PPR on all targetsArtem Borisov
* No matter how hard QC tried to improve these features, they still suffer from stability issues, mainly due to the unpredictable nature of vmpressure they rely on. Change-Id: Icd14c79298a3c268abffa06ed17a79dececf423a
2020-05-20sdm660-common: Start vendor.cdsprpcd only for sdm660Max Weffers
* disable it for sdm636 and sdm630 * fixes logspam on twolip and whyred with cdsprpcd not able to start Change-Id: I4de5333709c2fb57f315b47842fbd12d4d80c36d Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
2020-05-10sdm660-common: Make fastrpc_shell_3 publicly availabledianlujitao
* Used by GCAM for DSP-accelerated HDR processing * Arguably we should label /vendor/dsp/cdsp/fastrpc_shell_3 to same_process_hal_file like Pixels, but the partition is prebuilt thus we're unable to relabel it. * Copy the file to writable tmpfs, setup attributes and bind mount back to workaround the limitation. Change-Id: Ide90e5c7307d413db5ece736e859559f06679545
2020-05-06sdm660-common: Add cdsprpcddianlujitao
Change-Id: If02197e5527c97abd5cb6f94073557f805227f61
2020-04-30sdm660-common: Disable HD logoDyneteve
Signed-off-by: Henrique Pereira <hlcpereira@pixelexperience.org> Change-Id: I2f3f2fc9f0e797170ab34d82b00b46259a5c7348
2020-04-30sdm660-common: Label xiaomi ril propsdianlujitao
Change-Id: I14b172af1fac85448e4f632bfb128427d136376b
2020-04-30sdm660-common: Remove deprecated sdclang flagMichael Bestas
Change-Id: I3747f06f2366aacfbd5aeea5944d1c1fe0f7d82e
2020-04-30sdm660-common: Make FM radio opt-indianlujitao
Change-Id: Idaebe34e18d16d042e247f0f2b06c8012fe4d287
2020-04-30sdm660-common: Fix generated soong namespace for wayne-commondianlujitao
Change-Id: I0dbe909051e958f38ee6671cc72419c52b4e6db9
2020-04-30sdm660-common: Decommonize SEdianlujitao
Change-Id: If3194b0a8d7ffc8a8d42d2f7c6a8dde9e4235d1d
2020-04-30sdm660-common: Update mlipay from wayne V11.0.3.0.PDCCNXMMichael Bestas
Change-Id: Iaf42319089c5be2e83704c960c6eacf2e73c2028
2020-04-30sdm660-common: Update widevine from jasmine V11.0.8.0.QDIMIXMMichael Bestas
Change-Id: I983c6b98ba5e0b92b648dad8c8c0d22cb4076637
2020-04-30sdm660-common: Enforce vendor tree presenceChristopher N. Hesse
A compiled build has no chance of booting without the prebuilt binaries, so fail the build if those are not present. Change-Id: Iadd43e887d426732e549969ab8deb14194ca818d
2020-04-30sdm660-common: Remove devicesettings resources from lineage.dependenciesLuK1337
* Synced by default since LineageOS/android@9bd031c Change-Id: I822298f856f4d1012f847a8be311310f5e51f2bb
2020-04-30sdm660-common: sepolicy: Remove deprecated power HAL stats policiesMichael Bestas
Change-Id: If1b846c96c7c029afe73b9676e42b38cd2889dc8
2020-04-30sdm660-common: Decommonize cryptfs_hwChirayu Desai
* Not needed for file based encryption which is used on jasmine_sprout Change-Id: I92e8dafa5babc0d4cae5a7f599269a14fe645ae2
2020-04-30sdm660-common: Don't provide a module for libgpustatsEthan Chen
Change-Id: I39efbf1c447fbed83477496a00da3a3cab329bea
2020-04-30sdm660-common: Start qseecom daemon as early as possible for FBEramandeep trehan
Qseecom needs to start at earlier stage for FBE to work properly. Change-Id: Ie2408f652df291ad6a1b0dee1e4d559ff35c7c45 Signed-off-by: Ramandeep Trehan <rtrehan@codeaurora.org>
2020-04-30sdm660-common: Add debug IMS props to workaround CarrierConfig restrictionsLuK1337
We support IMS features on carriers not listed in the CarrierConfig, so let's use the props to enable it everywhere. Change-Id: Id3ad71d522a22048f7ad86d89695ad262361632d Signed-off-by: Anunay Maheshwari <anunaym14@gmail.com>
2020-04-30sdm660-common: wifi: Enable DFS channel scanning in P2P searchLuK1337
* Fixes P2P when connected to 5GHz access point. Change-Id: I31890645510931c7e7a65759c915a09fec77a1cf Signed-off-by: Anunay Maheshwari <anunaym14@gmail.com>
2020-04-30sdm660-common: Build vendor variant of libdng_sdk for watermarkargraur
10-26 17:49:35.063 6856 6856 E CamX : [ERROR][UTILS ] camxosutilslinux.cpp:911 LibMap() dlopen: dlopen failed: library "libdng_sdk.so" not found, on '/vendor/lib/camera/components/com.qti.node.watermark.so' Signed-off-by: argraur <argraur@gmail.com> Change-Id: Id5d4a73d29418bd3b7c0c9f92e4d5efd8be68c3b Signed-off-by: Akhil Narang <akhilnarang.1999@gmail.com>
2020-04-30sdm660-common: Remove MiWatermark shimMax Weffers
Change-Id: I7611b322b2f2935fc9079f9a76f9f5d9096aec00
2020-04-30sdm660-common: Do not include BOARD_RECOVERYIMAGE_PARTITION_SIZE in A/B devicesSubhajeet Muhuri
Change-Id: Idfa9e31d7c7d607ecd2f07567232525b21e0a9ce
2020-04-30sdm660-common: parts: Add vector iconsarian
* from https://materialdesignicons.com/ with small changes Signed-off-by: Anunay Maheshwari <anunaym14@gmail.com> Change-Id: Ibbb18065f97ed6f8f5376752495255aeafe1db82
2020-04-30sdm660-common: doze: Move DozeUtils.checkDozeService in an handlerLuca Stefani
* There's no need to manually write to the gestures prefs as long we are sure the handler is run after we return true in the onPreferenceChangeListner Change-Id: I090c0c6c91267aff69c45365b95b5f5e26d07b07 Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> Signed-off-by: Akhil Narang <akhilnarang.1999@gmail.com> Signed-off-by: Anunay Maheshwari <anunaym14@gmail.com>
2020-04-30sdm660-common: Decommonize USB halDavide Garberi
* Some devices in the common tree with USB C can take advantage of the stock aosp interface and use Power Delivery * On the other side micro USB devices will get the usb power mode menu broken using aosp's USB interface Change-Id: I513f3ede9cb3a5e119b0e00a860ebdcbfb30b9ca