From 0d6b9ddcc1b4285ffce358dba6ee918b580f5e44 Mon Sep 17 00:00:00 2001 From: BubbleFang Date: Mon, 10 Jun 2019 20:49:54 +0800 Subject: [PATCH 01/19] audio: Add support for incall-music-uplink2 usecase Test: Local test Change-Id: Iec24871d8cea96a28235be0aced2d35c6a2926be Signed-off-by: BubbleFang --- audio_platform_info_tavil.xml | 1 + mixer_paths_tavil.xml | 68 +++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 29dd509..da2c392 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -66,6 +66,7 @@ + diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index c702250..b0290fb 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -2366,6 +2366,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 25c6408e81ecf7dfb7357b9a4c1b0fcb6f145ce2 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Tue, 1 Oct 2019 17:15:13 -0700 Subject: [PATCH 02/19] taimen: Use InProcessWifiStack instead of Wifistack The base_system.mk adds WifiStack.apk, but the overrides rule will ensure that InProcessWifiStack.apk will run on taimen. Bug: 135691051 Test: Ensured that taimen uses the in process version of the APK. Change-Id: Ic458214a3502f9d17aa52a7d600f9af368b34461 --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index 6ed96cd..393f394 100644 --- a/device.mk +++ b/device.mk @@ -147,3 +147,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_phase_offset_ns=1500000 PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_app_phase_offset_ns=15000000 + +# TODO (b/141955764): Remove InProcessWifiStack +PRODUCT_PACKAGES += \ + InProcessWifiStack From 2d0c4af4215d723a6a6dfae330da834b85c5ceb3 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Fri, 11 Oct 2019 09:57:15 -0700 Subject: [PATCH 03/19] Clean up RROs using config_show_regulatory_info Runtime Resource Overlays (RROs) can no longer change the value of resources in manifest when read during PackagerParser. Remove usages of config_show_regulatory_info from overlays as they no longer reflect the enable state of the regulatory info activity. Bug: 135048762 Test: adb shell pm resolve-activity com.android.settings/com.android.settings.RegulatoryInfoDisplayActivity Change-Id: Ieba7f252bd009680c1d4366fa6e197c06a856e83 --- .../apps/Settings/res/values/bools.xml | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 overlay/packages/apps/Settings/res/values/bools.xml diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml deleted file mode 100644 index fdb0565..0000000 --- a/overlay/packages/apps/Settings/res/values/bools.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - true - - From 070a780d4eb3ad2daa6667b90b17d73746589d78 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 31 Oct 2019 13:26:13 -0700 Subject: [PATCH 04/19] taimen: Remove wifi related internal overlays These are replaced by formal mainline module overlays. Bug: 143464763 Test: Send for Wifi regression tests Change-Id: Ifa1250a58cc305bc96135dd2c315dc5a96fd0506 --- overlay/frameworks/base/core/res/res/values/config.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index bab33e2..88f0822 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -292,10 +292,4 @@ 12 - - - true - - - true From 7ffb2a1e01c094f7d0633a28b09006cfe29d0080 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Tue, 19 Nov 2019 06:39:18 -0800 Subject: [PATCH 05/19] taimen: Remove InProcessWifiStack from .mk Reason for revert: Wifi services no longer plan to be a separate APK/process for mainline. Will instead become a jar loaded from Apex. Bug: 144722612 Test: Device boots up & connects to wifi networks. Change-Id: Ia98269e7c81fc14edc632384dfd70d010a1397ca --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index 393f394..6ed96cd 100644 --- a/device.mk +++ b/device.mk @@ -147,7 +147,3 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_phase_offset_ns=1500000 PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_app_phase_offset_ns=15000000 - -# TODO (b/141955764): Remove InProcessWifiStack -PRODUCT_PACKAGES += \ - InProcessWifiStack From dc21e9b22ea070b48686b3515f885274a0c8e9fe Mon Sep 17 00:00:00 2001 From: Lalit Maganti Date: Wed, 4 Dec 2019 19:51:04 +0000 Subject: [PATCH 06/19] taimen: enable Perfetto by default Change-Id: Ib1ec0f99146257273ee601979a6e4543582b5e51 Context: go/perfetto-by-default Bug: 137963570 Test: checking product/build.prop in Treehugger builds --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index 35e0645..489d496 100644 --- a/device.mk +++ b/device.mk @@ -137,10 +137,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vibrator.hal.tick.duration=4 \ ro.vibrator.hal.heavyclick.duration=12 -# Enable Perfetto traced -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - persist.traced.enable=1 - # Early phase offset for SurfaceFlinger (b/75985430) PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_phase_offset_ns=1500000 From a111d453c2c9488ebe1d559139b3af004707d203 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Fri, 6 Dec 2019 17:46:26 -0800 Subject: [PATCH 07/19] Do not assign LOCAL_MULTILIB to AUDIOSERVER_MULTILIB Bug: 121208203 Test: treehugger Change-Id: I2b7ed2178382d53f0e8bbae310193b5e8b64f755 --- voice_processing/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk index d4b125a..8b86420 100644 --- a/voice_processing/Android.mk +++ b/voice_processing/Android.mk @@ -21,7 +21,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := voice_processing_descriptors.c LOCAL_C_INCLUDES += $(call include-path-for, audio-effects) LOCAL_HEADER_LIBRARIES := libhardware_headers -LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB) LOCAL_MODULE := libqcomvoiceprocessingdescriptors LOCAL_MODULE_RELATIVE_PATH := soundfx LOCAL_MODULE_TAGS := optional From 540b33473853f5331673a063edf3c96dbcb30892 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Tue, 4 Feb 2020 17:05:47 -0800 Subject: [PATCH 08/19] Convert voice_processing/Android.mk file to Android.bp See build/soong/README.md for more information. Bug: 122333388 Test: treehugger Change-Id: Ia43180b01607d0b55abccf7b507725a717ad693b --- voice_processing/Android.bp | 29 +++++++++++++++++++++++++++++ voice_processing/Android.mk | 33 --------------------------------- 2 files changed, 29 insertions(+), 33 deletions(-) create mode 100644 voice_processing/Android.bp delete mode 100644 voice_processing/Android.mk diff --git a/voice_processing/Android.bp b/voice_processing/Android.bp new file mode 100644 index 0000000..baaf550 --- /dev/null +++ b/voice_processing/Android.bp @@ -0,0 +1,29 @@ +// Copyright 2016 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. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +cc_library_shared { + name: "libqcomvoiceprocessingdescriptors", + srcs: ["voice_processing_descriptors.c"], + header_libs: [ + "libaudioeffects", + "libhardware_headers", + ], + relative_install_path: "soundfx", + owner: "qcom", + proprietary: true, + cflags: [ + "-Wall", + "-Werror", + ], +} diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk deleted file mode 100644 index 8b86420..0000000 --- a/voice_processing/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2016 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifneq ($(filter taimen, $(TARGET_DEVICE)),) - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := voice_processing_descriptors.c -LOCAL_C_INCLUDES += $(call include-path-for, audio-effects) -LOCAL_HEADER_LIBRARIES := libhardware_headers -LOCAL_MODULE := libqcomvoiceprocessingdescriptors -LOCAL_MODULE_RELATIVE_PATH := soundfx -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_OWNER := qcom -LOCAL_PROPRIETARY_MODULE := true -LOCAL_CFLAGS := -Wall -Werror - -include $(BUILD_SHARED_LIBRARY) - -endif From 2492dcc548b0f5de9d50c219ddc5df315a6fdd33 Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Thu, 6 Feb 2020 16:38:44 +0800 Subject: [PATCH 09/19] thermal: Enable monitoring battery in thermal hal Enable monitoring battery temperature in thermal hal to prevent battery shutdown too late. Bug: 128812625 Test: pts/device-presubmit test pass Change-Id: I0ceaf10ad322900b4595ecbf6f8e9560f250186a --- thermal_info_config.json | 3 ++- thermal_info_config_evt.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/thermal_info_config.json b/thermal_info_config.json index 087b7eb..02e904e 100644 --- a/thermal_info_config.json +++ b/thermal_info_config.json @@ -148,7 +148,8 @@ 60.0 ], "VrThreshold":"NAN", - "Multiplier":0.001 + "Multiplier":0.001, + "Monitor":true }, { "Name":"usb_port_temp", diff --git a/thermal_info_config_evt.json b/thermal_info_config_evt.json index 39671b8..f79bca6 100644 --- a/thermal_info_config_evt.json +++ b/thermal_info_config_evt.json @@ -148,7 +148,8 @@ 60.0 ], "VrThreshold":"NAN", - "Multiplier":0.001 + "Multiplier":0.001, + "Monitor":true }, { "Name":"usb_port_temp", From 1d97f7055550d375aa7f371e148c3ec9aff0bd29 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 6 Feb 2020 19:02:28 +0900 Subject: [PATCH 10/19] Move VNDK APEX to vendor partition ... for aosp_* targets so that we don't need to update vendor.img everytime there is a change in the VNDK libraries Bug: 140136207 Test: m Change-Id: Ic7ffaa9503902884f219400cf93516a6fbf8b210 --- aosp_taimen.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aosp_taimen.mk b/aosp_taimen.mk index 5653fd5..ced8b52 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -35,6 +35,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_RESTRICT_VENDOR_FILES := owner +PRODUCT_PACKAGES += com.android.vndk.current.on_vendor + PRODUCT_MANUFACTURER := Google PRODUCT_BRAND := Android PRODUCT_NAME := aosp_taimen From d759c54d5354b148a6870de877c9f6f5f31b8d91 Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Tue, 4 Feb 2020 12:28:33 -0800 Subject: [PATCH 11/19] Moved telephony overlays for Walleye and Taimen Moved vendor overlays for Walleye and Taimen to device to support backwards compatability. Bug: 148390250 Test: Built walleye Test: Built taimen Change-Id: I594ffac6ea600c70ce24c6821e57e8fcc6895a75 --- device.mk | 3 ++ rro_overlays/TelephonyOverlay/Android.bp | 26 ++++++++++++++ .../TelephonyOverlay/AndroidManifest.xml | 28 +++++++++++++++ .../donottranslate_config.xml | 27 ++++++++++++++ .../res/values/donottranslate_arrays.xml | 35 +++++++++++++++++++ .../res/values/donottranslate_config.xml | 27 ++++++++++++++ .../donottranslate_config.xml | 24 +++++++++++++ .../donottranslate_config.xml | 24 +++++++++++++ .../res/values/donottranslate_config.xml | 24 +++++++++++++ 9 files changed, 218 insertions(+) create mode 100644 rro_overlays/TelephonyOverlay/Android.bp create mode 100644 rro_overlays/TelephonyOverlay/AndroidManifest.xml create mode 100644 rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml create mode 100644 rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml create mode 100644 rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml create mode 100644 rro_overlays/TelephonyOverlay/Taimen/res/values-mcc310-mnc004/donottranslate_config.xml create mode 100644 rro_overlays/TelephonyOverlay/Taimen/res/values-mcc311-mnc480/donottranslate_config.xml create mode 100644 rro_overlays/TelephonyOverlay/Taimen/res/values/donottranslate_config.xml diff --git a/device.mk b/device.mk index 489d496..b17b2c8 100644 --- a/device.mk +++ b/device.mk @@ -31,6 +31,9 @@ $(warning Overlays defined in '$(DEVICE_PACKAGE_OVERLAYS)' will override '$(PROD endif DEVICE_PACKAGE_OVERLAYS += device/google/taimen/overlay +PRODUCT_PACKAGES += \ + TelephonyOverlay2017Taimen + # Audio PRODUCT_COPY_FILES += \ device/google/taimen/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlays/TelephonyOverlay/Android.bp new file mode 100644 index 0000000..2210226 --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Android.bp @@ -0,0 +1,26 @@ +// +// Copyright (C) 2020 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. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +runtime_resource_overlay { + name: "TelephonyOverlay2017Taimen", + resource_dirs: ["Taimen/res","Common/res"], + certificate: "platform", + product_specific: true, + aaptflags: ["--auto-add-overlay"], + manifest: "AndroidManifest.xml", + theme: "TelephonyOverlay2017Taimen", +} + diff --git a/rro_overlays/TelephonyOverlay/AndroidManifest.xml b/rro_overlays/TelephonyOverlay/AndroidManifest.xml new file mode 100644 index 0000000..e3662bc --- /dev/null +++ b/rro_overlays/TelephonyOverlay/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml new file mode 100644 index 0000000..b940d41 --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml @@ -0,0 +1,27 @@ + + + + + + + + 4 + + diff --git a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml new file mode 100644 index 0000000..41dc40a --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml @@ -0,0 +1,35 @@ + + + + + + + 1 + + diff --git a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml new file mode 100644 index 0000000..6234fb4 --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml @@ -0,0 +1,27 @@ + + + + + + true + + + true + + diff --git a/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc310-mnc004/donottranslate_config.xml new file mode 100644 index 0000000..0695db7 --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc310-mnc004/donottranslate_config.xml @@ -0,0 +1,24 @@ + + + + + g011c + + http://uaprof.vtext.com/google/g011c/g011c.xml + diff --git a/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc311-mnc480/donottranslate_config.xml new file mode 100644 index 0000000..0695db7 --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc311-mnc480/donottranslate_config.xml @@ -0,0 +1,24 @@ + + + + + g011c + + http://uaprof.vtext.com/google/g011c/g011c.xml + diff --git a/rro_overlays/TelephonyOverlay/Taimen/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Taimen/res/values/donottranslate_config.xml new file mode 100644 index 0000000..3f8385d --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Taimen/res/values/donottranslate_config.xml @@ -0,0 +1,24 @@ + + + + + g011c + + http://www.gstatic.com/android/sms/G011C.xml + From 685790abe1cc1c5b6f88d51bbd5a78216adc7719 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Tue, 18 Feb 2020 10:41:04 +0000 Subject: [PATCH 12/19] Add brightness float values to config file. Test: manual testing - ensure that the brightness value in Settings>Display>Brightness Level can go the full range from 0% to 100%. Change-Id: Ife1f2796bb3b8ec5f508903afd30a31556b49cbe --- .../base/core/res/res/values/config.xml | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 88f0822..7ebee49 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -116,19 +116,25 @@ true - - 98 - 140 140 - - 1 + + 0.0 + + + 1.0 + + + 0.38188976378 - - - - - - diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml deleted file mode 100644 index b940d41..0000000 --- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - 4 - - diff --git a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml deleted file mode 100644 index 41dc40a..0000000 --- a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - 1 - - diff --git a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml deleted file mode 100644 index 6234fb4..0000000 --- a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - true - - - true - - diff --git a/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc310-mnc004/donottranslate_config.xml deleted file mode 100644 index 0695db7..0000000 --- a/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc310-mnc004/donottranslate_config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - g011c - - http://uaprof.vtext.com/google/g011c/g011c.xml - diff --git a/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc311-mnc480/donottranslate_config.xml deleted file mode 100644 index 0695db7..0000000 --- a/rro_overlays/TelephonyOverlay/Taimen/res/values-mcc311-mnc480/donottranslate_config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - g011c - - http://uaprof.vtext.com/google/g011c/g011c.xml - diff --git a/rro_overlays/TelephonyOverlay/Taimen/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Taimen/res/values/donottranslate_config.xml deleted file mode 100644 index 3f8385d..0000000 --- a/rro_overlays/TelephonyOverlay/Taimen/res/values/donottranslate_config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - g011c - - http://www.gstatic.com/android/sms/G011C.xml - From 141c48e6f0256d6000a1b8575405ad8a4d60abb2 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 27 Feb 2020 14:55:43 -0800 Subject: [PATCH 14/19] Update vendor blobs list for R BUG: 150403679 Change-Id: I22e8463448e96acab101f63ecd266db2bf3ea57d --- self-extractors/extract-lists.txt | 1 - self-extractors/qcom/staging/device-partial.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt index b5c8272..e4d1ab3 100644 --- a/self-extractors/extract-lists.txt +++ b/self-extractors/extract-lists.txt @@ -18,7 +18,6 @@ system/framework/cneapiclient.jar \ system/framework/com.quicinc.cne.api-V1.0-java.jar \ system/framework/com.quicinc.cne.jar \ - system/framework/embmslibrary.jar \ system/framework/qcrilhook.jar \ system/framework/rcsimssettings.jar \ system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so \ diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index 0d21a76..1e0eb4b 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -28,7 +28,6 @@ PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/cneapiclient.jar:system/framework/cneapiclient.jar:qcom \ vendor/qcom/taimen/proprietary/com.quicinc.cne.api-V1.0-java.jar:system/framework/com.quicinc.cne.api-V1.0-java.jar:qcom \ vendor/qcom/taimen/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \ - vendor/qcom/taimen/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \ vendor/qcom/taimen/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \ vendor/qcom/taimen/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ vendor/qcom/taimen/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ From 8f4ad2afa7519eee8acfa9e9ed05745081e288b3 Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Tue, 31 Mar 2020 13:01:20 +0800 Subject: [PATCH 15/19] Remove ELF PRODUCT_COPY_FILES We're banning ELF prebuilts in PRODUCT_COPY_FILES. Define prebuilt modules for vendor prebuilts so we can run check_elf_file.py on them. Use PRODUCT_PACKAGES to install ELF prebuilts. Bug: 152277096 Bug: 140560012 Test: run ./generate-packages.sh with BID 6345366 Test: build aosp_taimen-userdebug on \ rvc-dev-plus-aosp-without-vendor with the generated tarball Change-Id: I1a715ac89aef6faf2cc88fbf7d4336e79f21e7ca --- self-extractors/qcom/staging/Android.bp.txt | 417 ++++++++++++++++++ .../qcom/staging/device-partial.mk | 33 +- 2 files changed, 432 insertions(+), 18 deletions(-) create mode 100644 self-extractors/qcom/staging/Android.bp.txt diff --git a/self-extractors/qcom/staging/Android.bp.txt b/self-extractors/qcom/staging/Android.bp.txt new file mode 100644 index 0000000..0cc1c9b --- /dev/null +++ b/self-extractors/qcom/staging/Android.bp.txt @@ -0,0 +1,417 @@ +// Copyright (C) 2020 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. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +soong_namespace { +} + +cc_prebuilt_library_shared { + name: "com.qualcomm.qti.imsrtpservice@1.0", + arch: { + arm: { + srcs: ["com.qualcomm.qti.imsrtpservice@1.0.so"], + shared_libs: [ + "libhidlbase", + // "libhidltransport", + // "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/com.qualcomm.qti.imsrtpservice@1.0.so"], + shared_libs: [ + "libhidlbase", + // "libhidltransport", + // "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, + check_elf_files: false, +} + +cc_prebuilt_library_shared { + name: "libdiag_system", + arch: { + arm: { + srcs: ["libdiag_system.so"], + shared_libs: [ + "liblog", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/libdiag_system.so"], + shared_libs: [ + "liblog", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "libimscamera_jni", + arch: { + arm: { + srcs: ["libimscamera_jni.so"], + shared_libs: [ + "libnativehelper", + "libcutils", + "libutils", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/libimscamera_jni.so"], + shared_libs: [ + "libnativehelper", + "libcutils", + "libutils", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "libimsmedia_jni", + arch: { + arm: { + srcs: ["libimsmedia_jni.so"], + shared_libs: [ + "libnativehelper", + "libcutils", + "libutils", + "libgui", + "libbinder", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/libimsmedia_jni.so"], + shared_libs: [ + "libnativehelper", + "libcutils", + "libutils", + "libgui", + "libbinder", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "lib-imsvideocodec", + arch: { + arm: { + srcs: ["lib-imsvideocodec.so"], + shared_libs: [ + "libmediandk", + "libcutils", + "libutils", + "liblog", + "libnativehelper", + "libandroid", + "libui", + "libmedia", + "libbinder", + "libGLESv2", + "libgui", + "libdiag_system", + "libEGL", + "lib-imsvtutils", + "libcamera_client", + "lib-imsvtextutils", + "libnativewindow", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/lib-imsvideocodec.so"], + shared_libs: [ + "libmediandk", + "libcutils", + "libutils", + "liblog", + "libnativehelper", + "libandroid", + "libui", + "libmedia", + "libbinder", + "libGLESv2", + "libgui", + "libdiag_system", + "libEGL", + "lib-imsvtutils", + "libcamera_client", + "lib-imsvtextutils", + "libnativewindow", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "lib-imsvtextutils", + arch: { + arm: { + srcs: ["lib-imsvtextutils.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "lib-imsvtutils", + "libGLESv2", + "libEGL", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/lib-imsvtextutils.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "lib-imsvtutils", + "libGLESv2", + "libEGL", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "lib-imsvt", + arch: { + arm: { + srcs: ["lib-imsvt.so"], + shared_libs: [ + "libdiag_system", + "libcutils", + "libutils", + "liblog", + "libnativehelper", + "libandroid", + "libgui", + "libui", + "libbinder", + "lib-imsvideocodec", + "lib-imsvtutils", + "libbase", + "libhardware_legacy", + "libhardware", + // "libhwbinder", + "libhidlbase", + // "libhidltransport", + "com.qualcomm.qti.imsrtpservice@1.0", + "librcc", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/lib-imsvt.so"], + shared_libs: [ + "libdiag_system", + "libcutils", + "libutils", + "liblog", + "libnativehelper", + "libandroid", + "libgui", + "libui", + "libbinder", + "lib-imsvideocodec", + "lib-imsvtutils", + "libbase", + "libhardware_legacy", + "libhardware", + // "libhwbinder", + "libhidlbase", + // "libhidltransport", + "com.qualcomm.qti.imsrtpservice@1.0", + "librcc", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, + check_elf_files: false, +} + +cc_prebuilt_library_shared { + name: "lib-imsvtutils", + arch: { + arm: { + srcs: ["lib-imsvtutils.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/lib-imsvtutils.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "librcc", + arch: { + arm: { + srcs: ["librcc.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/librcc.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index 1e0eb4b..2a53a8a 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -12,11 +12,25 @@ # See the License for the specific language governing permissions and # limitations under the License. +PRODUCT_SOONG_NAMESPACES += \ + vendor/qcom/taimen/proprietary + # AOSP packages required by the blobs PRODUCT_PACKAGES := \ ims # blob(s) necessary for Taimen hardware +PRODUCT_PACKAGES += \ + com.qualcomm.qti.imsrtpservice@1.0 \ + libdiag_system \ + libimscamera_jni \ + libimsmedia_jni \ + lib-imsvideocodec \ + lib-imsvtextutils \ + lib-imsvt \ + lib-imsvtutils \ + librcc \ + PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \ vendor/qcom/taimen/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \ @@ -30,21 +44,4 @@ PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \ vendor/qcom/taimen/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \ vendor/qcom/taimen/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ - vendor/qcom/taimen/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/libdiag_system.so:system/lib64/libdiag_system.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/libimscamera_jni.so:system/lib64/libimscamera_jni.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/libimsmedia_jni.so:system/lib64/libimsmedia_jni.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/lib-imsvideocodec.so:system/lib64/lib-imsvideocodec.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \ - vendor/qcom/taimen/proprietary/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ - vendor/qcom/taimen/proprietary/libdiag_system.so:system/lib/libdiag_system.so:qcom \ - vendor/qcom/taimen/proprietary/libimscamera_jni.so:system/lib/libimscamera_jni.so:qcom \ - vendor/qcom/taimen/proprietary/libimsmedia_jni.so:system/lib/libimsmedia_jni.so:qcom \ - vendor/qcom/taimen/proprietary/lib-imsvideocodec.so:system/lib/lib-imsvideocodec.so:qcom \ - vendor/qcom/taimen/proprietary/lib-imsvtextutils.so:system/lib/lib-imsvtextutils.so:qcom \ - vendor/qcom/taimen/proprietary/lib-imsvt.so:system/lib/lib-imsvt.so:qcom \ - vendor/qcom/taimen/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \ - vendor/qcom/taimen/proprietary/librcc.so:system/lib/librcc.so:qcom \ + From d5d826255009421c31ec4ada5e79b4daf3d39945 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 9 Jun 2020 10:33:09 +0800 Subject: [PATCH 16/19] audio: update microphone information Update "microphone_characteristics" and "input_snd_device_mic_mapping". Test: manual regression test Bug: 155053215 Signed-off-by: Jasmine Cha Change-Id: If43cdc600f1e9165034f8865aaa42772ea54041f --- audio_platform_info_tavil.xml | 114 +++++++++++++++++++++++++--------- 1 file changed, 83 insertions(+), 31 deletions(-) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index da2c392..6056231 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -121,7 +121,7 @@ frequencies="100.00 106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00" responses="-1.17 -1.13 -1.09 -1.06 -1.02 -0.98 -0.96 -0.94 -0.91 -0.87 -0.84 -0.82 -0.79 -0.78 -0.76 -0.75 -0.72 -0.70 -0.68 -0.66 -0.63 -0.60 -0.58 -0.55 -0.53 -0.53 -0.49 -0.46 -0.43 -0.41 -0.37 -0.33 -0.30 -0.27 -0.24 -0.21 -0.16 -0.12 -0.07 -0.02 0.00 0.06 0.09 0.12 0.17 0.24 0.25 0.25 0.35 0.45 0.56 0.66 0.78 0.96 0.98 1.08 1.26 1.49 1.67 1.93 2.04 2.28 2.47 2.65 2.86 3.42 3.93 4.54 5.03 5.59 6.40 7.59 8.72 10.83 10.43 13.91 18.52 25.40 22.48 16.63 13.18 10.53 8.41 5.85 3.78 3.68 3.19 2.93 0.59 2.93 2.62 1.44 3.01" sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.04974 0.15736 0.00426" /> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7cf1a9368a93d51c1980680c469ec14f494a1348 Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Tue, 16 Jun 2020 15:31:39 +0800 Subject: [PATCH 17/19] [DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_actions resource We plan to disable active edge from P20 project. Since the deferred_medium_priority_actions contains ASSIST_GESTURE action and it will be the showing deferred setup condition. So we add a new PixelSetupWizardOverlayActiveEdge RRO package to enable this action from deferred_medium_priority_actions for P19 and older project. go/suw-disable-activie-edge Bug: 158540758 Test: manual test Change-Id: I9b033a06e04ea6c97003d972058e0c7b0349d6c9 --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index 489d496..da37191 100644 --- a/device.mk +++ b/device.mk @@ -146,3 +146,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_phase_offset_ns=1500000 PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_app_phase_offset_ns=15000000 + +# Setup wizard overlay packages for ActiveEdge +PRODUCT_PACKAGES += \ + PixelSetupWizardOverlayActiveEdge \ From ac8a09f7981b7b1ffce628652d53fb65de27b449 Mon Sep 17 00:00:00 2001 From: Ken Chen Date: Mon, 22 Jun 2020 01:39:14 +0000 Subject: [PATCH 18/19] Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." Revert submission 11818631-deferred_medium_priority_actions Reason for revert: Reverted Changes: Id1d6d67f6:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I9bc31a200:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I9b033a06e:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I1633e191c:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I56d8f9e5d:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I086d2d9a5:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... Ibc6e15d29:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... I086d2d9a5:[DO NOT MERGE] Remove ASSIST_GESTURE action from d... Change-Id: I0d174786308589a8bd6eaa0453b8614008b509d9 --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index da37191..489d496 100644 --- a/device.mk +++ b/device.mk @@ -146,7 +146,3 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_phase_offset_ns=1500000 PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.early_gl_app_phase_offset_ns=15000000 - -# Setup wizard overlay packages for ActiveEdge -PRODUCT_PACKAGES += \ - PixelSetupWizardOverlayActiveEdge \ From 4744ee6eb6034da601a318acd1c31890c71c5c37 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 23 Jun 2020 15:35:26 +0900 Subject: [PATCH 19/19] Remove unnecessary sysprop settings These debuf.sf.early_* properties have been inactive because they are all eclipsed by the settings in wahoo/device.mk. Specifically, // wahoo/device.mk PRODUCT_PROPERTY_OVERRIDES := a=10 // taimen/device.mk include wahoo/device.mk PRODUCT_PROPERTY_OVERRIDES += a=20 With above, PRODUCT_PROPERTY_OVERRIDES becomes "a=10 a=20" and the build system has chosen "a=10" via the uniq-pairs-by-first-component macro. This was because PRODUCT_* lists were designed with an assumption that those mk files are inherited (without being included) in which case the values from more specific *.mk file are 'prepended' (not appaended). Since the settings in taimen/device.mk has been obsolete, let's remove them. This problem was actually found with I9c073a21c8257987cf2378012cadaeeeb698a4fb where duplicated sysprop assignments are prohibited, which is an attempt to make the sysprop settings be agnostic to the confusing ordering behavior imposed by the product inheritance mechanism. Bug: 117892318 Bug: 158735147 Test: m Exempt-From-Owner-Approval: cherry-pick master Merged-In: I6d1dd46edba0ad69586791935fca0da484ef2746 (cherry picked from commit 695f1fbe29f2ea08ed3a5cefb0fa487bea9144f4) Change-Id: I6d1dd46edba0ad69586791935fca0da484ef2746 --- device.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/device.mk b/device.mk index 489d496..04fcc36 100644 --- a/device.mk +++ b/device.mk @@ -137,12 +137,3 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vibrator.hal.tick.duration=4 \ ro.vibrator.hal.heavyclick.duration=12 -# Early phase offset for SurfaceFlinger (b/75985430) -PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_phase_offset_ns=1500000 -PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_app_phase_offset_ns=500000 -PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_gl_phase_offset_ns=1500000 -PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_gl_app_phase_offset_ns=15000000