Snap for 7703367 from 5d19bba5a41fc925a535803c7e77f7a7a0502444 to sc-v2-release
Change-Id: I2071859a19c9d21d4f1f84b29a27ec01fba16cb7
This commit is contained in:
commit
2cf430c3e2
7 changed files with 24 additions and 16 deletions
|
@ -79,8 +79,12 @@ volume index from 0 to 100.
|
||||||
ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
|
ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
|
||||||
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
|
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
|
||||||
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
|
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
|
||||||
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"
|
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
|
||||||
ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
|
<point>1,-6000</point>
|
||||||
|
<point>20,-4790</point>
|
||||||
|
<point>60,-2140</point>
|
||||||
|
<point>100,0</point>
|
||||||
|
</volume>
|
||||||
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
|
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
|
||||||
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
|
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
|
||||||
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
|
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
|
||||||
|
|
|
@ -14,7 +14,8 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
TARGET_KERNEL_DIR := device/google/raviole-kernel
|
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
|
||||||
|
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
|
||||||
|
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
|
||||||
|
|
|
@ -14,7 +14,8 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
TARGET_KERNEL_DIR := device/google/raviole-kernel
|
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
|
||||||
|
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
|
||||||
|
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
|
||||||
|
|
|
@ -14,7 +14,8 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
TARGET_KERNEL_DIR := device/google/raviole-kernel
|
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
|
||||||
|
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
|
||||||
|
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk)
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
|
||||||
|
|
|
@ -14,7 +14,8 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
TARGET_KERNEL_DIR := device/google/raviole-kernel
|
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
|
||||||
|
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
|
||||||
|
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk)
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
|
||||||
|
|
|
@ -331,7 +331,7 @@
|
||||||
"K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"],
|
"K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"],
|
||||||
"K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"],
|
"K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"],
|
||||||
"I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"],
|
"I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"],
|
||||||
"S_Power":["NAN", "NAN", 3500, 1500, "NAN", "NAN", "NAN"],
|
"S_Power":["NAN", "NAN", 3500, 1800, "NAN", "NAN", "NAN"],
|
||||||
"MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"],
|
"MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"],
|
||||||
"MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"],
|
"MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"],
|
||||||
"I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"]
|
"I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"]
|
||||||
|
@ -339,7 +339,7 @@
|
||||||
"BindedCdevInfo": [
|
"BindedCdevInfo": [
|
||||||
{
|
{
|
||||||
"CdevRequest": "thermal-cpufreq-0",
|
"CdevRequest": "thermal-cpufreq-0",
|
||||||
"CdevWeightForPID": [0.085, 0.085, 0.085, 0.085, 0.085, 0.085, 0.085],
|
"CdevWeightForPID": [0.07, 0.07, 0.07, 0.07, 0.07, 0.07, 0.07],
|
||||||
"CdevCeiling": [3, 3, 6, 7, 8, 10, 10],
|
"CdevCeiling": [3, 3, 6, 7, 8, 10, 10],
|
||||||
"LimitInfo": [0, 0, 0, 0, 8, 10, 10],
|
"LimitInfo": [0, 0, 0, 0, 8, 10, 10],
|
||||||
"BindedPowerRail": "S4M_VDD_CPUCL0",
|
"BindedPowerRail": "S4M_VDD_CPUCL0",
|
||||||
|
@ -348,7 +348,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"CdevRequest": "thermal-cpufreq-1",
|
"CdevRequest": "thermal-cpufreq-1",
|
||||||
"CdevWeightForPID": [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08],
|
"CdevWeightForPID": [0.066, 0.066, 0.066, 0.066, 0.066, 0.066, 0.066],
|
||||||
"CdevCeiling": [7, 7, 8, 9, 11, 13, 13],
|
"CdevCeiling": [7, 7, 8, 9, 11, 13, 13],
|
||||||
"LimitInfo": [0, 0, 0, 0, 11, 13, 13],
|
"LimitInfo": [0, 0, 0, 0, 11, 13, 13],
|
||||||
"BindedPowerRail": "S3M_VDD_CPUCL1",
|
"BindedPowerRail": "S3M_VDD_CPUCL1",
|
||||||
|
@ -357,7 +357,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"CdevRequest": "thermal-cpufreq-2",
|
"CdevRequest": "thermal-cpufreq-2",
|
||||||
"CdevWeightForPID": [0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38],
|
"CdevWeightForPID": [0.313, 0.313, 0.313, 0.313, 0.313, 0.313, 0.313],
|
||||||
"CdevCeiling": [11, 11, 14, 14, 14, 16, 16],
|
"CdevCeiling": [11, 11, 14, 14, 14, 16, 16],
|
||||||
"LimitInfo": [0, 0, 0, 0, 14, 16, 16],
|
"LimitInfo": [0, 0, 0, 0, 14, 16, 16],
|
||||||
"BindedPowerRail": "S2M_VDD_CPUCL2",
|
"BindedPowerRail": "S2M_VDD_CPUCL2",
|
||||||
|
@ -366,7 +366,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"CdevRequest": "thermal-gpufreq-0",
|
"CdevRequest": "thermal-gpufreq-0",
|
||||||
"CdevWeightForPID": [0.455, 0.455, 0.455, 0.455, 0.455, 0.455, 0.455],
|
"CdevWeightForPID": [0.551, 0.551, 0.551, 0.551, 0.551, 0.551, 0.551],
|
||||||
"CdevCeiling": [7, 7, 8, 9, 10, 11, 11],
|
"CdevCeiling": [7, 7, 8, 9, 10, 11, 11],
|
||||||
"LimitInfo": [0, 0, 0, 0, 10, 11, 11],
|
"LimitInfo": [0, 0, 0, 0, 10, 11, 11],
|
||||||
"BindedPowerRail": "S2S_VDD_G3D",
|
"BindedPowerRail": "S2S_VDD_G3D",
|
||||||
|
|
|
@ -331,7 +331,7 @@
|
||||||
"K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"],
|
"K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"],
|
||||||
"K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"],
|
"K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"],
|
||||||
"I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"],
|
"I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"],
|
||||||
"S_Power":["NAN", "NAN", 3500, 1500, "NAN", "NAN", "NAN"],
|
"S_Power":["NAN", "NAN", 3500, 1800, "NAN", "NAN", "NAN"],
|
||||||
"MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"],
|
"MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"],
|
||||||
"MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"],
|
"MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"],
|
||||||
"I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"]
|
"I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"]
|
||||||
|
@ -339,7 +339,7 @@
|
||||||
"BindedCdevInfo": [
|
"BindedCdevInfo": [
|
||||||
{
|
{
|
||||||
"CdevRequest": "thermal-cpufreq-0",
|
"CdevRequest": "thermal-cpufreq-0",
|
||||||
"CdevWeightForPID": [0.085, 0.085, 0.085, 0.085, 0.085, 0.085, 0.085],
|
"CdevWeightForPID": [0.07, 0.07, 0.07, 0.07, 0.07, 0.07, 0.07],
|
||||||
"CdevCeiling": [3, 3, 6, 7, 8, 10, 10],
|
"CdevCeiling": [3, 3, 6, 7, 8, 10, 10],
|
||||||
"LimitInfo": [0, 0, 0, 0, 8, 10, 10],
|
"LimitInfo": [0, 0, 0, 0, 8, 10, 10],
|
||||||
"BindedPowerRail": "S4M_VDD_CPUCL0",
|
"BindedPowerRail": "S4M_VDD_CPUCL0",
|
||||||
|
@ -348,7 +348,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"CdevRequest": "thermal-cpufreq-1",
|
"CdevRequest": "thermal-cpufreq-1",
|
||||||
"CdevWeightForPID": [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08],
|
"CdevWeightForPID": [0.066, 0.066, 0.066, 0.066, 0.066, 0.066, 0.066],
|
||||||
"CdevCeiling": [7, 7, 8, 9, 11, 13, 13],
|
"CdevCeiling": [7, 7, 8, 9, 11, 13, 13],
|
||||||
"LimitInfo": [0, 0, 0, 0, 11, 13, 13],
|
"LimitInfo": [0, 0, 0, 0, 11, 13, 13],
|
||||||
"BindedPowerRail": "S3M_VDD_CPUCL1",
|
"BindedPowerRail": "S3M_VDD_CPUCL1",
|
||||||
|
@ -357,7 +357,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"CdevRequest": "thermal-cpufreq-2",
|
"CdevRequest": "thermal-cpufreq-2",
|
||||||
"CdevWeightForPID": [0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38],
|
"CdevWeightForPID": [0.313, 0.313, 0.313, 0.313, 0.313, 0.313, 0.313],
|
||||||
"CdevCeiling": [11, 11, 14, 14, 14, 16, 16],
|
"CdevCeiling": [11, 11, 14, 14, 14, 16, 16],
|
||||||
"LimitInfo": [0, 0, 0, 0, 14, 16, 16],
|
"LimitInfo": [0, 0, 0, 0, 14, 16, 16],
|
||||||
"BindedPowerRail": "S2M_VDD_CPUCL2",
|
"BindedPowerRail": "S2M_VDD_CPUCL2",
|
||||||
|
@ -366,7 +366,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"CdevRequest": "thermal-gpufreq-0",
|
"CdevRequest": "thermal-gpufreq-0",
|
||||||
"CdevWeightForPID": [0.455, 0.455, 0.455, 0.455, 0.455, 0.455, 0.455],
|
"CdevWeightForPID": [0.551, 0.551, 0.551, 0.551, 0.551, 0.551, 0.551],
|
||||||
"CdevCeiling": [7, 7, 8, 9, 10, 11, 11],
|
"CdevCeiling": [7, 7, 8, 9, 10, 11, 11],
|
||||||
"LimitInfo": [0, 0, 0, 0, 10, 11, 11],
|
"LimitInfo": [0, 0, 0, 0, 10, 11, 11],
|
||||||
"BindedPowerRail": "S2S_VDD_G3D",
|
"BindedPowerRail": "S2S_VDD_G3D",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue