diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-25 03:33:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-25 03:33:21 +0000 |
| commit | cfb00f32ce62fd6defe3b547ac171d3446c4b60c (patch) | |
| tree | a3c56ba4fe93bf72d73e59952f5357906455d732 | |
| parent | 28ec22b7d0f4d4eccccfbf1d87792eb9bb6ae4af (diff) | |
| parent | 797f878a1f82a07108f8f382cb1905911541dbef (diff) | |
| download | yukawa-cfb00f32ce62fd6defe3b547ac171d3446c4b60c.tar.gz | |
Merge changes I14d616dd,If7190c2b,Ic8701661 am: 82db39c3e1 am: f976dbd1f7 am: 797f878a1f
Change-Id: I35a74262cb9d614cf16c9c2063ba3c636af3e34e
| -rw-r--r-- | device-common.mk | 2 | ||||
| -rwxr-xr-x | manifest.xml | 2 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/device-common.mk b/device-common.mk index c185ff9..f7e0638 100644 --- a/device-common.mk +++ b/device-common.mk @@ -111,7 +111,7 @@ PRODUCT_PACKAGES += \ android.hardware.audio@2.0-service \ android.hardware.audio@6.0-impl \ android.hardware.audio.effect@6.0-impl \ - android.hardware.soundtrigger@2.1-impl \ + android.hardware.soundtrigger@2.2-impl \ # Hardware Composer HAL # diff --git a/manifest.xml b/manifest.xml index c160975..5eefb65 100755 --- a/manifest.xml +++ b/manifest.xml @@ -29,7 +29,7 @@ <hal format="hidl"> <name>android.hardware.soundtrigger</name> <transport>hwbinder</transport> - <version>2.1</version> + <version>2.2</version> <interface> <name>ISoundTriggerHw</name> <instance>default</instance> diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index e54b229..70e2ce5 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -9,6 +9,13 @@ /sys/devices/virtual/thermal(/.*)? u:object_r:sysfs_thermal:s0 /sys/class/thermal(/.*)? u:object_r:sysfs_thermal:s0 +/sys/devices/platform/soc/ffe03000.sd/mmc_host(/.*)? u:object_r:sysfs_suspend_stats:s0 +/sys/devices/platform/soc/ff800000.bus/ff8000a8.rtc/wakeup(/.*)? u:object_r:sysfs_suspend_stats:s0 +/sys/devices/platform/soc/ff800000.bus/ff8000a8.rtc/rtc/rtc0/wakeup1(/.*)? u:object_r:sysfs_suspend_stats:s0 +/sys/devices/platform/soc/ff800000.bus/ff8000a8.rtc/rtc/rtc0/hctosys u:object_r:sysfs_rtc:s0 +/sys/devices/platform/soc/ffd00000.bus/ffd24000.serial(/.*)? u:object_r:sysfs_suspend_stats:s0 +/sys/devices/platform/soc/ffe09000.usb/ff500000.usb(/.*)? u:object_r:sysfs_suspend_stats:s0 + # files in /vendor /(vendor|system/vendor)/lib(64)?/hw/gralloc\.yukawa\.so u:object_r:same_process_hal_file:s0 /vendor/bin/hw/android\.hardware\.health@2\.0-service\.yukawa u:object_r:hal_health_default_exec:s0 |