summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-20sdm660-common: sepolicy: Label /persistLuK1337
Change-Id: I471c0d1fedb51eabc32b54ab35a9823db8efd034
2020-12-20sdm660-common: vndk: Skip elf files check for vndk-ext libsDavide Garberi
Change-Id: I5983e0327a56c93c4cfc542258293249f6a59fa1
2020-12-20sdm660-common: Adapt libinit to Android 11Lucchetto
Change-Id: Ia6b6f753891b639dad4e380bdba6b594faf2a550
2020-12-20sdm660-common: TetheringOverlay: Disable BPFLuK1337
* Such is life with 4.4 kernels. Change-Id: I1c5e3fab63271b1e3fe6c814d96edbde782f27e8
2020-12-20sdm660-common: Add TetheringOverlayWeilun Du
BUG: 163800715 Signed-off-by: Weilun Du <wdu@google.com> Change-Id: Ia0834f5215ff8c3b13effa591bd2f84d93419a06
2020-12-20sdm660-common: overlay: revise p2p tether interface regex patternJimmy Chen
xiaomi sdm660 does not use separate interface for a group, it will share main p2p0 interface. Bug: 141382930 Test: run P2P with xiaomi sdm660 as GO Change-Id: I061ed0ac66f8ae75c84d7683f66d4baffd3a3112
2020-12-20sdm660-common: overlay: add p2p regex for tethering modesJimmy Chen
Bug: 137602441 Test: CtsVerifier - Wi-Fi Direct Change-Id: I215da71e96348b6bba19d4a3c6fd8c8048ff46d6
2020-12-20sdm660-common: Remove qcom.fmradio from PRODUCT_BOOT_JARSAayush Gupta
- It's loaded as app library, hence not needed to be a boot jar Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com> Change-Id: I1b1357be08b511f5af7663dee256849e2f2b1b63
2020-12-20sdm660-common: Add fingerprint configuration to overlayKevin Chyn
The framework was changed in Android R to require explicit authenticator registration. This change allows apps to continue to use the fingerprint sensor. Bug: 147445115 Test: Builds Change-Id: Id3385edc784b2053c8b54ec3153728f4e6e22a45
2020-12-20sdm660-common: sepolicy: Use hal_attribute_lineage for mlipayMichael Bestas
Change-Id: I777042d5ade15bfa02724880f4bab4931e5772f5
2020-12-20sdm660-common: sepolicy: Use BOARD_VENDOR_SEPOLICY_DIRSFelix
BOARD_SEPOLICY_DIRS is deprecated. Change-Id: I046282b2a2e8c541726fb29cb0044503322d4be9
2020-12-20sdm660-common: rootdir: Nuke wigignpt entryDavide Garberi
* We don't ship this blob and this rootdir entry gave an error due to the hidl interface Change-Id: I253494294870c653ef4e593e61007a35516ca059
2020-12-20sdm660-common: Build new aidl qti power HALArian
Change-Id: I4bdea354e54d34d0dfe9b811e228fc6f8762d2ed
2020-12-20sdm660-common: Add a shim for dpmframeworkArian
* libdpmframework depends on strndup16to8 and strdup8to16 methods. Change-Id: I39d252b5830b752728a0c8607d32d8a279524ce1 Co-authored-by: Demon000 <demonsingur@gmail.com>
2020-12-20sdm660-common: Switch to patchelf from tools-lineageMichael Bestas
Change-Id: If1a7328804fb9bc39ccec70690f1090f2d0509b3
2020-12-20sdm660-common: ifaa: Use new UnsupportedAppUsage annotationdianlujitao
Change-Id: Ife370a74a7eec384b6732c63ce78408afef5d95c
2020-12-20sdm660-common: Build libhidltransport/libhwbinderLuK1337
* Needed for old blobs Change-Id: I43fc0e46547dfc126a4b2ac9dcc82c7c4f2ee172
2020-12-20sdm660-common: Add protobuf vendorcompat libix5
Our blobs are compiled against libprotobuf-full-cpp.so, but starting in R, Android is using a versioned naming approach, e.g. libprotobuf-cpp-full-3.9.1.so. See https://r.android.com/1109518 The entry in public.libraries.txt is needed to allow the linker to find and use the lib outside the VNDK. See https://source.android.com/devices/tech/config/namespaces_libraries [wight554: added libprotobuf-cpp-lite as well] Signed-off-by: Volodymyr Zhdanov <wight554@gmail.com> Change-Id: I28222c89e1e07017867088492a726ee9d45d8e6f
2020-12-20sdm660-common: Use component-override to configure BluetoothRyan Mitchell
Runtime Resource Overlays (RROs) can no longer change the value of resources in manifest when read during PackagerParser. This change uses component-override to enable the service by default. Remove usages of profile_supported_* from overlays as they no longer configure the enable state of Bluetooth components. Bug: 135048762 Test: adb shell pm query-services \ com.android.bluetooth/.a2dpsink.A2dpSinkService adb shell pm query-services \ com.android.bluetooth/.avrcp.AvrcpTargetService adb shell pm query-services \ com.android.bluetooth/.avrcpcontroller.AvrcpControllerService adb shell pm query-services \ com.android.bluetooth/.ba.BATService adb shell pm query-services \ com.android.bluetooth/.hid.HidDeviceService adb shell pm query-services \ com.android.bluetooth/.sap.SapService Change-Id: I284d254a921b14d1533745611a083f4b5a27d9dc
2020-12-20sdm660-common: Add WifiOverlayRoshan Pius
Bug: 148617260 Test: Device boots up and connects to wifi networks. Change-Id: Iec27a6d947a232a42451ef095dc73d1a52327db5
2020-12-20sdm660-common: overlay: Remove wifi related internal overlaysRoshan Pius
These are replaced by formal mainline module overlays. Bug: 143464763 Test: Send for Wifi regression tests Change-Id: I45881ed210132252b9c5c7d6be03ed845e33f971
2020-12-20sdm660-common: Enable link ProbingDavid Su
Change-Id: I66a5fcb3b9e4645521f1fa258eb74f563cc816a8
2020-12-20sdm660-common: Delete dhcpcd init entries, since dhcpcd is no more.Lorenzo Colitti
Bug: 27192644 Change-Id: I1aa25190c07f027884421d91c1e93f214493382d
2020-12-20sdm660-common: overlay: Remove bnep\\d from tetherable BT interfacesLuK1337
Change-Id: Iac714d2de9a4d225da6fc3463d3fb99a4bb714a7
2020-12-20sdm660-common: Enable IWLAN assisted modeLuca Stefani
Change-Id: Id9d8d9d2ed27dad2754abfa3887ee1a1ff97875a
2020-12-20sdm660-common: remove ims daemon entries from init.target.rcManoj Basapathi
Change-Id: I9b6154c38ad98f8f43bdb0cfc764e5531e1a129e
2020-12-20sdm660-common: Add missing 64-bit interface required for IMSPranav Vashi
Also include only required bitness of the interfaces Change-Id: I8ef9171cd5d53cfb5ddfaae49b56696940ae6442
2020-12-20sdm660-common: Drop leftover WiFi state related flagLuK1337
* WIFI_DRIVER_OPERSTATE_PATH is no longer needed, also it's not ported to 17.0. Change-Id: Idfa7fb69428642300da2ddc6825774c9e692e648
2020-12-20sdm660-common: overlays: Drop no longer existing configsBruno Martins
These configs were introduced by CAF changes that haven't been no longer ported. Change-Id: Ibe2db05befa015115952ec81b2064553fde9feb4
2020-12-20sdm660-common: overlay: Cleanup after making tty_enabled = true by default.Sanket Padawe
Bug: 27875275 Change-Id: Ibf5f749c0d3d421128237915542a52f941574ac9
2020-12-20sdm660-common: overlay: Enable Fast bss transition configRoshan Pius
Bug: 32607043 Test: Manual testing Change-Id: I43d34efc6b7dbca08d430b0b68f06fa70c4925cc
2020-12-20sdm660-common: doze: Allow to wake the screen on gestures instead of pulsingArian
Co-authored-by: Nauval Rizky <enuma.alrizky@gmail.com> Co-authored-by: Fabian Leutenegger <fabian.leutenegger@bluewin.ch> Change-Id: I1e74f8eafa51843e77d2d8c514c646a4494327cd
2020-12-20sdm660-common: doze: Refactor whole codeTheScarastic
Change-Id: I14303556c66ea6bd3d111b5ce7e176711a676824
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