diff options
| -rw-r--r-- | BoardConfig-common.mk | 2 | ||||
| -rw-r--r-- | audio/rt5514_dsp_fw1.bin | bin | 19936 -> 19968 bytes | |||
| -rw-r--r-- | audio/rt5514_dsp_fw2.bin | bin | 39037 -> 38789 bytes | |||
| -rw-r--r-- | audio/rt5514_dsp_fw3.bin | bin | 35408 -> 35408 bytes | |||
| -rw-r--r-- | audio/rt5514_dsp_fw4.bin | bin | 12944 -> 12944 bytes | |||
| -rw-r--r-- | audio_policy_configuration.xml | 2 | ||||
| -rw-r--r-- | default-permissions.xml | 7 | ||||
| -rw-r--r-- | device-common.mk | 4 | ||||
| -rw-r--r-- | media_codecs_performance.xml | 291 | ||||
| -rw-r--r-- | mixer_paths_intcodec_b4.xml | 7 | ||||
| -rw-r--r-- | mixer_paths_intcodec_s4.xml | 7 | ||||
| -rw-r--r-- | overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png | bin | 405740 -> 405019 bytes | |||
| -rw-r--r-- | overlay/packages/services/Telephony/res/values/config.xml | 4 | ||||
| -rw-r--r-- | sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png | bin | 413726 -> 413353 bytes | |||
| -rw-r--r-- | sound_trigger_platform_info.xml | 1 |
15 files changed, 126 insertions, 199 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 7560b5f6..202d2f3d 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -178,7 +178,7 @@ VSYNC_EVENT_PHASE_OFFSET_NS := 2000000 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000 # Display -TARGET_HAS_WIDE_COLOR_DISPLAY := true +TARGET_HAS_WIDE_COLOR_DISPLAY := false TARGET_USES_DISPLAY_RENDER_INTENTS := true TARGET_USES_COLOR_METADATA := true TARGET_USES_DRM_PP := true diff --git a/audio/rt5514_dsp_fw1.bin b/audio/rt5514_dsp_fw1.bin Binary files differindex ea6b5bbd..41ad05a7 100644 --- a/audio/rt5514_dsp_fw1.bin +++ b/audio/rt5514_dsp_fw1.bin diff --git a/audio/rt5514_dsp_fw2.bin b/audio/rt5514_dsp_fw2.bin Binary files differindex 138878e8..8d7555d2 100644 --- a/audio/rt5514_dsp_fw2.bin +++ b/audio/rt5514_dsp_fw2.bin diff --git a/audio/rt5514_dsp_fw3.bin b/audio/rt5514_dsp_fw3.bin Binary files differindex 77877cd5..3d2dd2ac 100644 --- a/audio/rt5514_dsp_fw3.bin +++ b/audio/rt5514_dsp_fw3.bin diff --git a/audio/rt5514_dsp_fw4.bin b/audio/rt5514_dsp_fw4.bin Binary files differindex c2b31290..06274e52 100644 --- a/audio/rt5514_dsp_fw4.bin +++ b/audio/rt5514_dsp_fw4.bin diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml index 7ad24ee0..be772388 100644 --- a/audio_policy_configuration.xml +++ b/audio_policy_configuration.xml @@ -79,7 +79,7 @@ samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> </mixPort> - <mixPort name="primary input" role="sink"> + <mixPort name="primary input" role="sink" maxActiveCount="0"> <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/> diff --git a/default-permissions.xml b/default-permissions.xml index dfa33a57..a3018b6c 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -60,6 +60,7 @@ <exception package="com.google.android.projection.gearhead" sha256-cert-digest="FD:B0:0C:43:DB:DE:8B:51:CB:31:2A:A8:1D:3B:5F:A1:77:13:AD:B9:4B:28:F5:98:D7:7F:8E:B8:9D:AC:EE:DF"> + <!-- Gearhead legacy --> <permission name="android.permission.READ_PHONE_STATE" fixed="false"/> <permission name="android.permission.CALL_PHONE" fixed="false"/> <permission name="android.permission.READ_CALL_LOG" fixed="false"/> @@ -69,6 +70,12 @@ <permission name="android.permission.SEND_SMS" fixed="false"/> <permission name="android.permission.RECORD_AUDIO" fixed="false"/> <permission name="android.permission.READ_CALENDAR" fixed="false"/> + <!-- For Top Gear --> + <permission name="android.permission.PROCESS_OUTGOING_CALLS" fixed="false"/> + <permission name="android.permission.READ_SMS" fixed="false"/> + <permission name="android.permission.RECEIVE_MMS" fixed="false"/> + <permission name="android.permission.WRITE_CALL_LOG" fixed="false"/> + <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/> </exception> <exception diff --git a/device-common.mk b/device-common.mk index 34b8327f..36947127 100644 --- a/device-common.mk +++ b/device-common.mk @@ -118,9 +118,5 @@ AB_OTA_POSTINSTALL_CONFIG += \ POSTINSTALL_OPTIONAL_product=false \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=true -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.has_wide_color_display=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true -# Must align with HAL types Dataspace -# The data space of wide color gamut composition preference is Dataspace::DISPLAY_P3 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.wcg_composition_dataspace=143261696 diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml index 87ef858f..b24bd19e 100644 --- a/media_codecs_performance.xml +++ b/media_codecs_performance.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2018 The Android Open Source Project +<!-- Copyright 2019 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,245 +14,154 @@ limitations under the License. --> -<!-- Generated file for b4s4 using measurements on PD2A.190102.002 by get_achievable_rates.py--> <MediaCodecs> <Encoders> <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true"> - <Limit name="measured-frame-rate-176x144" range="392-406" /> <!-- N=22 v90%=1.4 --> - </MediaCodec> - <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true"> - <!-- measured 98%:216-758 med:553/552 FLAKY(mn=213.5 < 216 - 1104) --> - <Limit name="measured-frame-rate-176x144" range="427-552" /> <!-- TWEAKED N=100 v98%=1.9 --> + <Limit name="measured-frame-rate-176x144" range="412-412" /> <!-- N=128 v98%=1.5 --> </MediaCodec> <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="204-220" /> <!-- N=22 v90%=1.3 --> - <Limit name="measured-frame-rate-720x480" range="126-129" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1280x720" range="52-53" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1920x1080" range="38-40" /> <!-- N=22 v90%=1.2 --> + <Limit name="measured-frame-rate-320x240" range="360-360" /> <!-- N=126 v98%=1.5 --> + <Limit name="measured-frame-rate-720x480" range="159-160" /> <!-- N=128 v98%=1.0 --> + <Limit name="measured-frame-rate-1280x720" range="62-62" /> <!-- N=124 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="51-51" /> <!-- N=126 v98%=1.1 --> </MediaCodec> <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="205-219" /> <!-- N=22 v90%=1.7 --> - <Limit name="measured-frame-rate-720x480" range="82-103" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1280x720" range="53-53" /> <!-- N=22 v90%=1.6 --> - <!-- measured 90%:14-24 med:15 SLOW --> - <Limit name="measured-frame-rate-1920x1080" range="23-28" /> <!-- N=22 v90%=1.3 --> + <Limit name="measured-frame-rate-320x240" range="256-256" /> <!-- N=128 v98%=1.4 --> + <!-- measured 98%:82-115 med:87 SLOW --> + <Limit name="measured-frame-rate-720x480" range="87-97" /> <!-- N=128 v98%=1.2 --> + <Limit name="measured-frame-rate-1280x720" range="52-52" /> <!-- N=128 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="31-32" /> <!-- N=128 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.qti.avc.encoder" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="205-224" /> <!-- N=22 v90%=1.6 --> - <Limit name="measured-frame-rate-720x480" range="125-125" /> <!-- N=22 v90%=1.7 --> - <Limit name="measured-frame-rate-1280x720" range="52-53" /> <!-- N=22 v90%=1.5 --> - <!-- measured 90%:6-33 med:13 variance:2.2 --> - <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=22 --> - </MediaCodec> - <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true"> - <!-- measured 98%:211-388 med:262/262 N=80 --> - <Limit name="measured-frame-rate-320x240" range="262-262" /> <!-- v98%=1.4 --> - <!-- measured 97%:73-151 med:129/131 N=58 --> - <Limit name="measured-frame-rate-720x480" range="129-131" /> <!-- v97%=1.4 (-PPR1.180510.004) --> - <Limit name="measured-frame-rate-1280x720" range="74-74" /> <!-- N=100 v98%=1.2 --> - <!-- measured 98%:39-51 med:44/45 N=82 --> - <Limit name="measured-frame-rate-1920x1080" range="44-45" /> <!-- v98%=1.1 --> + <Limit name="measured-frame-rate-320x240" range="377-377" /> <!-- N=128 v98%=1.4 --> + <Limit name="measured-frame-rate-720x480" range="159-159" /> <!-- N=126 v98%=1.0 --> + <Limit name="measured-frame-rate-1280x720" range="62-62" /> <!-- N=128 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="51-51" /> <!-- N=128 v98%=1.1 --> </MediaCodec> <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" update="true"> - <Limit name="measured-frame-rate-320x240" range="227-238" /> <!-- N=22 v90%=1.3 --> - <Limit name="measured-frame-rate-720x480" range="117-117" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1280x720" range="45-45" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1920x1080" range="38-38" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-3840x2160" range="12-16" /> <!-- N=22 v90%=1.4 --> + <Limit name="measured-frame-rate-320x240" range="371-371" /> <!-- N=128 v98%=1.2 --> + <Limit name="measured-frame-rate-720x480" range="117-118" /> <!-- N=126 v98%=1.0 --> + <Limit name="measured-frame-rate-1280x720" range="45-45" /> <!-- N=126 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=128 v98%=1.0 --> + <Limit name="measured-frame-rate-3840x2160" range="20-22" /> <!-- N=110 v98%=1.1 --> + </MediaCodec> + <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" update="true"> + <Limit name="measured-frame-rate-320x240" range="49-49" /> <!-- N=128 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.qti.hevc.encoder" type="video/hevc" update="true"> - <Limit name="measured-frame-rate-320x240" range="203-203" /> <!-- N=22 v90%=1.7 --> - <Limit name="measured-frame-rate-720x480" range="116-116" /> <!-- N=22 v90%=1.7 --> - <Limit name="measured-frame-rate-1280x720" range="45-45" /> <!-- N=22 v90%=1.5 --> - <!-- measured 90%:7-33 med:13 variance:2.1 --> - <Limit name="measured-frame-rate-1920x1080" range="39-39" /> <!-- N=22 --> - <Limit name="measured-frame-rate-3840x2160" range="16-16" /> <!-- N=22 v90%=1.4 --> + <Limit name="measured-frame-rate-320x240" range="333-333" /> <!-- N=126 v98%=1.3 --> + <Limit name="measured-frame-rate-720x480" range="117-118" /> <!-- N=128 v98%=1.0 --> + <Limit name="measured-frame-rate-1280x720" range="45-45" /> <!-- N=128 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=126 v98%=1.0 --> + <Limit name="measured-frame-rate-3840x2160" range="20-22" /> <!-- N=124 v98%=1.1 --> </MediaCodec> <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true"> - <!-- measured 90%:159-355 med:227 FLAKY(113 - 476 < mx=643.5) --> - <Limit name="measured-frame-rate-176x144" range="374-391" /> <!-- N=22 v90%=1.5 --> - </MediaCodec> - <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true"> - <!-- measured 98%:213-786 med:531/540 N=98 FLAKY(mn=209.9 < 213 - 1080) --> - <Limit name="measured-frame-rate-176x144" range="419-540" /> <!-- TWEAKED v98%=1.9 --> + <Limit name="measured-frame-rate-176x144" range="370-396" /> <!-- N=128 v98%=1.5 --> </MediaCodec> <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="179-179" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-640x360" range="165-173" /> <!-- N=22 v90%=1.3 --> - <Limit name="measured-frame-rate-1280x720" range="51-51" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1920x1080" range="34-40" /> <!-- N=22 v90%=1.1 --> + <Limit name="measured-frame-rate-320x180" range="340-340" /> <!-- N=126 v98%=1.2 --> + <Limit name="measured-frame-rate-640x360" range="189-189" /> <!-- N=126 v98%=1.0 --> + <Limit name="measured-frame-rate-1280x720" range="51-51" /> <!-- N=122 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="45-45" /> <!-- N=126 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="332-332" /> <!-- N=22 v90%=1.5 --> - <Limit name="measured-frame-rate-640x360" range="119-122" /> <!-- N=22 v90%=1.5 --> - <Limit name="measured-frame-rate-1280x720" range="36-37" /> <!-- N=22 v90%=1.6 --> - <Limit name="measured-frame-rate-1920x1080" range="13-14" /> <!-- N=22 v90%=1.3 --> + <Limit name="measured-frame-rate-320x180" range="275-275" /> <!-- N=128 v98%=1.2 --> + <Limit name="measured-frame-rate-640x360" range="120-120" /> <!-- N=128 v98%=1.1 --> + <Limit name="measured-frame-rate-1280x720" range="35-36" /> <!-- N=128 v98%=1.1 --> + <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=128 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.qti.vp8.encoder" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="182-182" /> <!-- N=22 v90%=1.6 --> - <Limit name="measured-frame-rate-640x360" range="170-170" /> <!-- N=22 v90%=1.5 --> - <Limit name="measured-frame-rate-1280x720" range="51-51" /> <!-- N=22 v90%=1.6 --> - <!-- measured 90%:7-16 med:13 FLAKY(5 - 20 < mx=32.2) --> - <Limit name="measured-frame-rate-1920x1080" range="38-39" /> <!-- N=22 v90%=1.5 --> - </MediaCodec> - <!-- Measurements between PPR1.180419.002 and PPR1.180510.004 --> - <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true"> - <!-- measured 98%:37-66 med:59/58 N=92 --> - <Limit name="measured-frame-rate-320x180" range="58-58" /> <!-- v98%=1.3 (-PPR1.180514.002) --> - <!-- measured 97%:23-37 med:29/29 N=58 --> - <Limit name="measured-frame-rate-640x360" range="29-29" /> <!-- v97%=1.3 --> - <!-- measured 98%:16-27 med:20/20 N=92 --> - <Limit name="measured-frame-rate-1280x720" range="20-20" /> <!-- v98%=1.3 (-PPR1.180514.002) --> - <!-- measured 97%:11-15 med:12/12 N=58 --> - <Limit name="measured-frame-rate-1920x1080" range="12-12" /> <!-- v97%=1.1 --> - </MediaCodec> - <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" update="true"> - <Limit name="measured-frame-rate-320x180" range="140-195" /> - <Limit name="measured-frame-rate-640x360" range="61-61" /> - <Limit name="measured-frame-rate-1280x720" range="20-20" /> + <Limit name="measured-frame-rate-320x180" range="328-328" /> <!-- N=128 v98%=1.2 --> + <Limit name="measured-frame-rate-640x360" range="188-188" /> <!-- N=128 v98%=1.0 --> + <Limit name="measured-frame-rate-1280x720" range="51-51" /> <!-- N=128 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="45-45" /> <!-- N=128 v98%=1.0 --> </MediaCodec> </Encoders> <Decoders> <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true"> - <Limit name="measured-frame-rate-176x144" range="713-713" /> <!-- N=22 v90%=1.4 --> - </MediaCodec> - <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true"> - <!-- measured 97%:166-611 med:238/236 N=56 FLAKY(118 - 612 < mx=626.6) --> - <Limit name="measured-frame-rate-176x144" range="236-306" /> <!-- v97%=1.9 --> + <Limit name="measured-frame-rate-176x144" range="587-587" /> <!-- N=132 v98%=1.5 --> </MediaCodec> <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="768-787" /> <!-- N=22 v90%=1.5 --> - <Limit name="measured-frame-rate-720x480" range="534-536" /> <!-- N=22 v90%=1.6 --> - <!-- measured 90%:97-218 med:109 SLOW --> - <Limit name="measured-frame-rate-1280x720" range="377-378" /> <!-- N=22 v90%=1.5 --> - <Limit name="measured-frame-rate-1920x1080" range="179-180" /> <!-- N=22 v90%=1.1 --> + <Limit name="measured-frame-rate-320x240" range="488-493" /> <!-- N=132 v98%=1.5 --> + <Limit name="measured-frame-rate-720x480" range="375-392" /> <!-- N=132 v98%=1.2 --> + <Limit name="measured-frame-rate-1280x720" range="342-342" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1088" range="175-175" /> <!-- N=132 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="305-305" /> <!-- N=22 v90%=1.5 --> - <Limit name="measured-frame-rate-720x480" range="63-64" /> <!-- v90%=1.1 --> - <Limit name="measured-frame-rate-1280x720" range="23-23" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1920x1080" range="11-11" /> <!-- N=22 v90%=1.0 --> + <Limit name="measured-frame-rate-320x240" range="367-380" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-768x480" range="97-97" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-1280x720" range="38-38" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="18-18" /> <!-- N=132 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.qti.avc.decoder" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="768-832" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-720x480" range="536-536" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-1280x720" range="377-377" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-1920x1080" range="179-180" /> <!-- N=22 v90%=1.0 --> - </MediaCodec> - <!-- Measurements between PPR1.180419.002 and PPR1.180514.002 --> - <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true"> - <!-- measured 98%:166-778 med:251/255 N=62 FLAKY(126 - 778 < mx=781.3) variance:2.2 --> - <Limit name="measured-frame-rate-320x240" range="251-391" /> <!-- TWEAKED --> - <!-- measured 95%:130-159 med:142/142 N=38 --> - <Limit name="measured-frame-rate-720x480" range="142-142" /> <!-- v95%=1.1 --> - <!-- measured 98%:37-62 med:41/42 N=64 --> - <Limit name="measured-frame-rate-1280x720" range="41-42" /> <!-- v98%=1.3 (-PPR1.180510.004) --> - <!-- measured 95%:23-31 med:26/26 N=38 --> - <Limit name="measured-frame-rate-1920x1080" range="26-26" /> <!-- v95%=1.2 --> + <Limit name="measured-frame-rate-320x240" range="494-498" /> <!-- N=132 v98%=1.5 --> + <Limit name="measured-frame-rate-720x480" range="367-389" /> <!-- N=132 v98%=1.2 --> + <Limit name="measured-frame-rate-1280x720" range="338-338" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-1920x1088" range="175-175" /> <!-- N=132 v98%=1.0 --> </MediaCodec> <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true"> - <Limit name="measured-frame-rate-352x288" range="838-838" /> <!-- N=22 v90%=1.3 --> - <Limit name="measured-frame-rate-640x360" range="606-606" /> <!-- N=22 v90%=1.3 --> - <Limit name="measured-frame-rate-720x480" range="505-505" /> <!-- N=22 v90%=1.2 --> - <Limit name="measured-frame-rate-1280x720" range="398-399" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1920x1080" range="209-209" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-3840x2160" range="51-51" /> <!-- N=22 v90%=1.0 --> + <Limit name="measured-frame-rate-352x288" range="527-527" /> <!-- N=132 v98%=1.6 --> + <Limit name="measured-frame-rate-640x360" range="453-453" /> <!-- N=132 v98%=1.3 --> + <Limit name="measured-frame-rate-720x480" range="411-411" /> <!-- N=132 v98%=1.2 --> + <Limit name="measured-frame-rate-1280x720" range="362-367" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-1920x1080" range="209-210" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-3840x2160" range="23-23" /> <!-- N=132 v98%=1.1 --> </MediaCodec> <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true"> - <Limit name="measured-frame-rate-352x288" range="317-331" /> <!-- N=22 v90%=1.3 --> - <Limit name="measured-frame-rate-640x360" range="150-160" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-720x480" range="140-150" /> <!-- N=22 v90%=1.1--> - <Limit name="measured-frame-rate-1280x720" range="61-61" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1920x1080" range="38-39" /> <!-- N=22 v90%=1.1 --> + <Limit name="measured-frame-rate-384x288" range="336-352" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-640x360" range="201-210" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-768x480" range="209-209" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-1280x720" range="91-91" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="49-50" /> <!-- N=132 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.qti.hevc.decoder" type="video/hevc" update="true"> - <Limit name="measured-frame-rate-352x288" range="837-837" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-640x360" range="596-601" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-720x480" range="503-503" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-1280x720" range="397-398" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-1920x1080" range="209-209" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-3840x2160" range="51-51" /> <!-- N=22 v90%=1.0 --> - </MediaCodec> - <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true"> - <!-- measured 97%:176-462 med:362/363 N=56 FLAKY(mn=175.5 < 176 - 726) --> - <Limit name="measured-frame-rate-352x288" range="351-363" /> <!-- v97%=1.6 --> - <!-- measured 97%:220-392 med:369/361 N=56 --> - <Limit name="measured-frame-rate-640x360" range="358-361" /> <!-- v97%=1.3 --> - <!-- measured 98%:190-373 med:324/326 N=62 --> - <Limit name="measured-frame-rate-720x480" range="324-326" /> <!-- v98%=1.4 (-PPR1.180514.002) --> - <!-- measured 97%:99-132 med:118/115 N=56 --> - <Limit name="measured-frame-rate-1280x720" range="115-115" /> <!-- v97%=1.2 --> - <!-- measured 98%:58-69 med:66/66 N=62 --> - <Limit name="measured-frame-rate-1920x1080" range="66-66" /> <!-- v98%=1.1 --> + <Limit name="measured-frame-rate-352x288" range="532-532" /> <!-- N=132 v98%=1.6 --> + <Limit name="measured-frame-rate-640x360" range="452-452" /> <!-- N=132 v98%=1.4 --> + <Limit name="measured-frame-rate-720x480" range="412-412" /> <!-- N=132 v98%=1.2 --> + <Limit name="measured-frame-rate-1280x720" range="362-366" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-1920x1080" range="209-210" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-3840x2160" range="23-23" /> <!-- N=132 v98%=1.1 --> </MediaCodec> <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true"> - <Limit name="measured-frame-rate-176x144" range="623-728" /> <!-- N=22 v90%=1.5 --> - </MediaCodec> - <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true"> - <!-- measured 97%:165-732 med:231/230 N=56 variance:2.1 --> - <Limit name="measured-frame-rate-176x144" range="230-405" /> + <Limit name="measured-frame-rate-176x144" range="388-425" /> <!-- N=132 v93%=1.1 --> </MediaCodec> <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="683-683" /> <!-- N=22 v90%=1.8 --> - <Limit name="measured-frame-rate-640x360" range="354-509" /> <!-- N=22 v90%=1.4 --> - <Limit name="measured-frame-rate-1280x720" range="395-396" /> <!-- N=22 v90%=1.2 --> - <Limit name="measured-frame-rate-1920x1080" range="198-199" /> <!-- N=22 v90%=1.0 --> + <Limit name="measured-frame-rate-320x192" range="340-368" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-640x368" range="340-358" /> <!-- N=132 v95%=1.1 --> + <Limit name="measured-frame-rate-1280x720" range="340-342" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-1920x1088" range="199-199" /> <!-- N=132 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="422-422" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-640x360" range="158-159" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-1280x720" range="36-36" /> <!-- v98%=1.2 --> - <Limit name="measured-frame-rate-1920x1080" range="13-13" /> <!-- N=22 v90%=1.0 --> + <Limit name="measured-frame-rate-320x180" range="562-562" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-640x360" range="256-256" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-1920x1080" range="30-31" /> <!-- N=132 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.qti.vp8.decoder" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="593-593" /> <!-- N=22 v90%=1.8 --> - <Limit name="measured-frame-rate-640x360" range="505-505" /> <!-- N=22 v90%=1.5 --> - <Limit name="measured-frame-rate-1280x720" range="396-396" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-1920x1080" range="198-199" /> <!-- N=22 v90%=1.0 --> - </MediaCodec> - <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true"> - <!-- measured 95%:172-515 med:323/322 N=38 --> - <Limit name="measured-frame-rate-320x180" range="1173-1174" /> <!-- v95%=1.7 (-PPB1.181031.001) --> - <!-- measured 98%:414-529 med:481/483 N=62 --> - <Limit name="measured-frame-rate-640x360" range="481-483" /> <!-- v98%=1.1 --> - <!-- measured 98%:43-45 med:43/43 N=62 --> - <Limit name="measured-frame-rate-1920x1080" range="43-43" /> <!-- v98%=1.0 (-PPR1.180514.002) --> - </MediaCodec> - <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true"> - <Limit name="measured-frame-rate-320x180" range="587-587" /> <!-- N=22 v90%=1.6 --> - <Limit name="measured-frame-rate-640x360" range="472-472" /> <!-- N=22 v90%=1.3 --> - <Limit name="measured-frame-rate-1280x720" range="339-340" /> <!-- N=22 v90%=1.1 --> - <Limit name="measured-frame-rate-1920x1080" range="190-200" /> <!-- N=22 v90%=1.0 --> - <Limit name="measured-frame-rate-3840x2160" range="48-48" /> <!-- N=22 v90%=1.0 --> + <Limit name="measured-frame-rate-320x192" range="341-347" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-640x368" range="339-351" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-1280x720" range="337-337" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1088" range="199-199" /> <!-- N=132 v98%=1.0 --> + </MediaCodec> + <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true"> + <Limit name="measured-frame-rate-320x184" range="346-377" /> <!-- N=132 v97%=1.1 --> + <Limit name="measured-frame-rate-640x360" range="350-375" /> <!-- N=132 v95%=1.1 --> + <Limit name="measured-frame-rate-1280x720" range="336-336" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="199-200" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-3840x2160" range="18-18" /> <!-- N=132 v98%=1.1 --> </MediaCodec> <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true"> - <Limit name="measured-frame-rate-320x180" range="435-436" /> <!-- N=22 v90%=1.0 --> - <!-- measured 90%:63-157 med:102 FLAKY(50 - 200 < mx=223.5) --> - <Limit name="measured-frame-rate-640x360" range="129-130" /> <!-- N=22 v90%=1.6 --> - <Limit name="measured-frame-rate-1280x720" range="70-71" /> <!-- N=22 v90%=1.3 --> - <Limit name="measured-frame-rate-1920x1080" range="42-43" /> <!-- N=22 v90%=1.3 --> + <Limit name="measured-frame-rate-320x180" range="483-483" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-640x360" range="143-144" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-1280x720" range="78-78" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="47-47" /> <!-- N=132 v98%=1.0 --> </MediaCodec> <MediaCodec name="c2.qti.vp9.decoder" type="video/x-vnd.on2.vp9" update="true"> - <!-- measured 90%:437-632 med:536 N=16 --> - <Limit name="measured-frame-rate-320x184" range="578-578" /> <!-- v90%=1.2 --> - <!-- measured 90%:494-634 med:560 N=16 --> - <Limit name="measured-frame-rate-640x360" range="474-475" /> <!-- v90%=1.1 --> - <!-- measured 90%:339-342 med:340 N=16 --> - <Limit name="measured-frame-rate-1280x720" range="339-340" /> <!-- v90%=1.0 --> - <!-- measured 90%:199-201 med:200 N=16 --> - <Limit name="measured-frame-rate-1920x1080" range="200-200" /> <!-- v90%=1.0 --> - <!-- measured 90%:20-22 med:21 N=16 --> - <Limit name="measured-frame-rate-3840x2160" range="48-48" /> <!-- v90%=1.0 --> - </MediaCodec> - <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true"> - <!-- measured 98%:172-1171 med:382/381 N=62 FLAKY(143 - 1172 < mx=1176.5) variance:2.6 --> - <Limit name="measured-frame-rate-320x180" range="286-586" /> - <!-- measured 95%:125-329 med:282/279 N=38 --> - <Limit name="measured-frame-rate-640x360" range="196-279" /> <!-- v95%=1.6 (-PPR1.180514.002) --> - <!-- measured 98%:74-111 med:93/92 N=61 --> - <Limit name="measured-frame-rate-1280x720" range="92-92" /> <!-- v98%=1.2 (-PPR1.180514.002) --> - <!-- measured 98%:49-77 med:53/54 N=62 --> - <Limit name="measured-frame-rate-1920x1080" range="53-54" /> <!-- v98%=1.2 --> + <!-- measured 93%:331-404 med:349 FLAKY(174 - 732 < mx=952.4) WIDEN(174 - 954) --> + <Limit name="measured-frame-rate-320x184" range="348-477" /> <!-- N=132 v93%=1.1 --> + <Limit name="measured-frame-rate-640x360" range="347-372" /> <!-- N=132 v98%=1.1 --> + <Limit name="measured-frame-rate-1280x720" range="335-335" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-1920x1080" range="199-200" /> <!-- N=132 v98%=1.0 --> + <Limit name="measured-frame-rate-3840x2160" range="18-18" /> <!-- N=132 v98%=1.1 --> </MediaCodec> </Decoders> </MediaCodecs> diff --git a/mixer_paths_intcodec_b4.xml b/mixer_paths_intcodec_b4.xml index 0ae4c1b0..ddd9a0fc 100644 --- a/mixer_paths_intcodec_b4.xml +++ b/mixer_paths_intcodec_b4.xml @@ -1257,6 +1257,11 @@ <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1" /> </path> + <path name="voicemmode2-call hearing-aid"> + <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="1"/> + <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1"/> + </path> + <path name="voicemmode2-call handset"> <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode2" value="1" /> <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1" /> @@ -1295,7 +1300,7 @@ <path name="voicemmode2-call usb-headphones"> <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" /> - <ctl name="VoiceMMode2_Tx Mixer INT3_MI2S_TX_MMode2" value="1" /> + <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1" /> </path> <path name="voicemmode2-call usb-headset"> diff --git a/mixer_paths_intcodec_s4.xml b/mixer_paths_intcodec_s4.xml index 0ae4c1b0..ddd9a0fc 100644 --- a/mixer_paths_intcodec_s4.xml +++ b/mixer_paths_intcodec_s4.xml @@ -1257,6 +1257,11 @@ <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1" /> </path> + <path name="voicemmode2-call hearing-aid"> + <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="1"/> + <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1"/> + </path> + <path name="voicemmode2-call handset"> <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode2" value="1" /> <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1" /> @@ -1295,7 +1300,7 @@ <path name="voicemmode2-call usb-headphones"> <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" /> - <ctl name="VoiceMMode2_Tx Mixer INT3_MI2S_TX_MMode2" value="1" /> + <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1" /> </path> <path name="voicemmode2-call usb-headset"> diff --git a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png Binary files differindex 6a481a78..59c73b54 100644 --- a/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png +++ b/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020b.png diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml index 4072b9e3..f9a7c262 100644 --- a/overlay/packages/services/Telephony/res/values/config.xml +++ b/overlay/packages/services/Telephony/res/values/config.xml @@ -28,4 +28,8 @@ This is used to support carriers which generate a recording tone to the remote party when a call recording app is in use. --> <bool name="config_support_telephony_audio_device">true</bool> + + <!-- This device requires that emergency calls are placed over the default data SIM when + possible because GNSS SUPL can only be received from the network on data subscription. --> + <bool name="config_gnss_supl_requires_default_data_for_emergency">true</bool> </resources> diff --git a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png Binary files differindex 861b8ecb..35c78dd0 100644 --- a/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png +++ b/sargo/overlay/packages/apps/Settings/res/drawable/regulatory_info_g020f.png diff --git a/sound_trigger_platform_info.xml b/sound_trigger_platform_info.xml index b06182ec..87ef7b13 100644 --- a/sound_trigger_platform_info.xml +++ b/sound_trigger_platform_info.xml @@ -36,6 +36,7 @@ <param enable_failure_detection="false" /> <param support_device_switch="false" /> <param transit_to_adsp_on_playback="true" /> + <param concurrent_capture="true" /> <!-- Below backend params must match with port used in mixer path file --> <!-- param used to configure backend sample rate, format and channels --> <param backend_port_name="PRI_TDM_TX_0" /> |
