From 145f9254ba794db50be531cb466186da48153d7b Mon Sep 17 00:00:00 2001 From: BubbleFang Date: Mon, 10 Jun 2019 20:28:54 +0800 Subject: [PATCH 01/16] audio: Add support for incall-music-uplink2 usecase Test: Local test Change-Id: I9e87cb6e36f0d3902a56f35a6e23b12d59334eb0 Signed-off-by: BubbleFang --- audio_platform_info_tavil.xml | 1 + mixer_paths_tavil.xml | 72 +++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 219f7dc..eb27b4b 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -77,6 +77,7 @@ + diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index 926d74f..01f07d0 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -2218,4 +2218,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 515e7619d72f0dc291eaad50e3bb895c7646b128 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Nov 2019 06:10:59 -0700 Subject: [PATCH 02/16] muskie: Remove wifi related internal overlays These are replaced by formal mainline module overlays. Bug: 143464763 Test: Send for Wifi regression tests Change-Id: I477d6e9732cae1fbb7fd4d1113533da8b865979f --- .../frameworks/base/core/res/res/values/config.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index bae87f1..c2c30a6 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -179,10 +179,6 @@ 8 - - true - true @@ -193,11 +189,4 @@ true - - - true - - - true - From 5b3fb23a77cf1f3c57926905313b539775db7edb Mon Sep 17 00:00:00 2001 From: Lalit Maganti Date: Wed, 4 Dec 2019 19:52:02 +0000 Subject: [PATCH 03/16] muskie: enable Perfetto by default Change-Id: I78765dbefc0a0c2f6d14df8f22b6e00a84d34c44 Context: go/perfetto-by-default Bug: 137963570 Test: checking product/build.prop in Treehugger builds --- device-walleye.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-walleye.mk b/device-walleye.mk index eebfb0f..36a5483 100644 --- a/device-walleye.mk +++ b/device-walleye.mk @@ -36,10 +36,6 @@ include device/google/muskie/device-common.mk PRODUCT_PROPERTY_OVERRIDES += \ ro.sf.lcd_density=420 -# Enable Perfetto traced -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - persist.traced.enable=1 - # Thermal HAL PRODUCT_COPY_FILES += \ device/google/muskie/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json From feac53b1b3b8e0faef02bfef3f031e1d4432e8c0 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Fri, 6 Dec 2019 17:46:26 -0800 Subject: [PATCH 04/16] Do not assign LOCAL_MULTILIB to AUDIOSERVER_MULTILIB Bug: 121208203 Test: treehugger Change-Id: I0fd14a697ccf95fd213734c64603ba0aa9aad38b --- voice_processing/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk index 0ff33c7..3321109 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 59bc1b706d1e5805d737a0b7b6d41cb6f4b4a13b Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Tue, 4 Feb 2020 17:05:48 -0800 Subject: [PATCH 05/16] Convert voice_processing/Android.mk file to Android.bp See build/soong/README.md for more information. Bug: 122333478 Test: treehugger Change-Id: I27f24ef6068620fbacd89f4124277805a4eb59ed --- voice_processing/Android.bp | 25 +++++++++++++++++++++++++ voice_processing/Android.mk | 32 -------------------------------- 2 files changed, 25 insertions(+), 32 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..e017af7 --- /dev/null +++ b/voice_processing/Android.bp @@ -0,0 +1,25 @@ +// 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, +} diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk deleted file mode 100644 index 3321109..0000000 --- a/voice_processing/Android.mk +++ /dev/null @@ -1,32 +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 muskie walleye, $(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 - -include $(BUILD_SHARED_LIBRARY) - -endif From 37f9667b4e29512411c1ffdef5a6619f804a50b1 Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Thu, 6 Feb 2020 16:55:07 +0800 Subject: [PATCH 06/16] thermal: Enable monitoring battery in thermal hal Enable monitoring battery to prevent battery shutdown too late. Bug: 128812625 Test: pts-tradefed run pts -m PtsThermalHalTestCases Change-Id: I52f2f816e7b11e4478ca0e09b5b5bfaa9211a39c --- thermal_info_config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/thermal_info_config.json b/thermal_info_config.json index 25f95d0..3bb24a9 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", From 8b22ee5fe950dec9b8e85d54f24965cfdd8154b0 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 6 Feb 2020 19:02:23 +0900 Subject: [PATCH 07/16] 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: Ifddaa3eb1623d3ec0a26c259790a43cdbb39424d --- aosp_walleye.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aosp_walleye.mk b/aosp_walleye.mk index 888c67d..7137bd9 100644 --- a/aosp_walleye.mk +++ b/aosp_walleye.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_walleye From 72ff6193efdb11a3d5811aaf476cdbe6a4033374 Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Tue, 4 Feb 2020 12:28:49 -0800 Subject: [PATCH 08/16] 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: I78a30c721308828101603f2d8a2193ef0ce8e709 --- device-walleye.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 | 29 +++++++++++++++ .../donottranslate_config.xml | 29 +++++++++++++++ .../res/values/donottranslate_config.xml | 24 +++++++++++++ 9 files changed, 228 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/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml create mode 100644 rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml create mode 100644 rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml diff --git a/device-walleye.mk b/device-walleye.mk index 36a5483..aa0d4e0 100644 --- a/device-walleye.mk +++ b/device-walleye.mk @@ -31,6 +31,9 @@ $(warning Overlays defined in '$(DEVICE_PACKAGE_OVERLAYS)' will override '$(PROD endif DEVICE_PACKAGE_OVERLAYS += device/google/muskie/walleye/overlay +PRODUCT_PACKAGES += \ + TelephonyOverlay2017Walleye + include device/google/muskie/device-common.mk PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlays/TelephonyOverlay/Android.bp new file mode 100644 index 0000000..cf148e5 --- /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: "TelephonyOverlay2017Walleye", + resource_dirs: ["Walleye/res","Common/res"], + certificate: "platform", + product_specific: true, + aaptflags: ["--auto-add-overlay"], + manifest: "AndroidManifest.xml", + theme: "TelephonyOverlay2017Walleye", +} + 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/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml new file mode 100644 index 0000000..4e3bbd5 --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml @@ -0,0 +1,29 @@ + + + + + + + + g011a + + http://uaprof.vtext.com/google/g011a/g011a.xml + + diff --git a/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml new file mode 100644 index 0000000..4e3bbd5 --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml @@ -0,0 +1,29 @@ + + + + + + + + g011a + + http://uaprof.vtext.com/google/g011a/g011a.xml + + diff --git a/rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml new file mode 100644 index 0000000..6afad03 --- /dev/null +++ b/rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml @@ -0,0 +1,24 @@ + + + + + g011a + + http://www.gstatic.com/android/sms/G011A.xml + From 6b114d15238ee771e2055026cd7831fabae4d082 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Tue, 18 Feb 2020 10:40:01 +0000 Subject: [PATCH 09/16] 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: Iccdd9c69d97ad94ea1956b44f9a7bedca4110ed7 --- .../base/core/res/res/values/config.xml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index c2c30a6..b3aaea8 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -157,13 +157,20 @@ 13 - - 98 + + 0.0 - - 1 + + 1.0 + + + 0.38188976378 From 1dfc69633b8e73db14109ecd7b414f93530508ac Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Tue, 18 Feb 2020 13:53:55 -0800 Subject: [PATCH 10/16] Rollback telephony-resources Bug: 149776042 Test: TeleServiceTests Change-Id: Ie3221cebd6c5b4822af502397fdfa76f22280618 --- device-walleye.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 | 29 --------------- .../donottranslate_config.xml | 29 --------------- .../res/values/donottranslate_config.xml | 24 ------------- 9 files changed, 228 deletions(-) delete mode 100644 rro_overlays/TelephonyOverlay/Android.bp delete mode 100644 rro_overlays/TelephonyOverlay/AndroidManifest.xml delete mode 100644 rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml delete mode 100644 rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml delete mode 100644 rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml delete mode 100644 rro_overlays/TelephonyOverlay/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml delete mode 100644 rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml delete mode 100644 rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml diff --git a/device-walleye.mk b/device-walleye.mk index aa0d4e0..36a5483 100644 --- a/device-walleye.mk +++ b/device-walleye.mk @@ -31,9 +31,6 @@ $(warning Overlays defined in '$(DEVICE_PACKAGE_OVERLAYS)' will override '$(PROD endif DEVICE_PACKAGE_OVERLAYS += device/google/muskie/walleye/overlay -PRODUCT_PACKAGES += \ - TelephonyOverlay2017Walleye - include device/google/muskie/device-common.mk PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlays/TelephonyOverlay/Android.bp deleted file mode 100644 index cf148e5..0000000 --- a/rro_overlays/TelephonyOverlay/Android.bp +++ /dev/null @@ -1,26 +0,0 @@ -// -// 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: "TelephonyOverlay2017Walleye", - resource_dirs: ["Walleye/res","Common/res"], - certificate: "platform", - product_specific: true, - aaptflags: ["--auto-add-overlay"], - manifest: "AndroidManifest.xml", - theme: "TelephonyOverlay2017Walleye", -} - diff --git a/rro_overlays/TelephonyOverlay/AndroidManifest.xml b/rro_overlays/TelephonyOverlay/AndroidManifest.xml deleted file mode 100644 index e3662bc..0000000 --- a/rro_overlays/TelephonyOverlay/AndroidManifest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - 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/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml deleted file mode 100644 index 4e3bbd5..0000000 --- a/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc310-mnc004/donottranslate_config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - g011a - - http://uaprof.vtext.com/google/g011a/g011a.xml - - diff --git a/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml deleted file mode 100644 index 4e3bbd5..0000000 --- a/rro_overlays/TelephonyOverlay/Walleye/res/values-mcc311-mnc480/donottranslate_config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - g011a - - http://uaprof.vtext.com/google/g011a/g011a.xml - - diff --git a/rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml deleted file mode 100644 index 6afad03..0000000 --- a/rro_overlays/TelephonyOverlay/Walleye/res/values/donottranslate_config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - g011a - - http://www.gstatic.com/android/sms/G011A.xml - From e0055ed8e2ceefc9209a32a6b140c378574ba89d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 27 Feb 2020 14:57:15 -0800 Subject: [PATCH 11/16] Update vendor blobs list for R BUG: 150403679 Change-Id: I281944e0965322a4a6c3095c099c39cdd8812c84 --- 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 c56e8fe..9212206 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/walleye/proprietary/cneapiclient.jar:system/framework/cneapiclient.jar:qcom \ vendor/qcom/walleye/proprietary/com.quicinc.cne.api-V1.0-java.jar:system/framework/com.quicinc.cne.api-V1.0-java.jar:qcom \ vendor/qcom/walleye/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \ - vendor/qcom/walleye/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \ vendor/qcom/walleye/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ vendor/qcom/walleye/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \ vendor/qcom/walleye/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ From 17bdc8b1125296e72aa7fb9b83e1cc85c0ac9682 Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Tue, 31 Mar 2020 14:33:31 +0800 Subject: [PATCH 12/16] 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_walleye-userdebug on \ rvc-dev-plus-aosp-without-vendor with the generated tarball Change-Id: Ib0e0678a569c61fe7edc9f492a27811825d93bec --- 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 9212206..d0367e6 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/walleye/proprietary + # AOSP packages required by the blobs PRODUCT_PACKAGES := \ ims # blob(s) necessary for Walleye 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/walleye/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \ vendor/qcom/walleye/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \ @@ -30,21 +44,4 @@ PRODUCT_COPY_FILES := \ vendor/qcom/walleye/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \ vendor/qcom/walleye/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ vendor/qcom/walleye/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \ - vendor/qcom/walleye/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/libdiag_system.so:system/lib64/libdiag_system.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/libimscamera_jni.so:system/lib64/libimscamera_jni.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/libimsmedia_jni.so:system/lib64/libimsmedia_jni.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/lib-imsvideocodec.so:system/lib64/lib-imsvideocodec.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \ - vendor/qcom/walleye/proprietary/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ - vendor/qcom/walleye/proprietary/libdiag_system.so:system/lib/libdiag_system.so:qcom \ - vendor/qcom/walleye/proprietary/libimscamera_jni.so:system/lib/libimscamera_jni.so:qcom \ - vendor/qcom/walleye/proprietary/libimsmedia_jni.so:system/lib/libimsmedia_jni.so:qcom \ - vendor/qcom/walleye/proprietary/lib-imsvideocodec.so:system/lib/lib-imsvideocodec.so:qcom \ - vendor/qcom/walleye/proprietary/lib-imsvtextutils.so:system/lib/lib-imsvtextutils.so:qcom \ - vendor/qcom/walleye/proprietary/lib-imsvt.so:system/lib/lib-imsvt.so:qcom \ - vendor/qcom/walleye/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \ - vendor/qcom/walleye/proprietary/librcc.so:system/lib/librcc.so:qcom \ + From a893431795e2cbe6ee8cc29eef1163d2abf65687 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Mon, 8 Jun 2020 15:49:11 +0100 Subject: [PATCH 13/16] Fix Walleye brightness curve. ag/11455081 caused a bug in the brightness slider that meant that all devices (except Walleye) could not slide it to the minimum. The hardcoded curves on walleye are now changed to start at 1 ("minimum brightness" like all the other devices) instead of 0 ("off"). Bug: 157838219 Test: manual - cover ambient light sensor - ensure brightness reduces but not to 0. grep for brightness splines too: adb shell dumpsys display | grep -i "spline\|mConfig" Change-Id: Idd5b011141edd7cd5cd1dee27b2647f55025fac8 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index b3aaea8..8d62506 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -100,7 +100,7 @@ This array should be equal in size to config_screenBrightnessBacklight. --> - 0 + 1 15 30 45 @@ -128,7 +128,7 @@ This array should be equal in size to config_screenBrightnessBacklight --> - 0 + 1.74 26.11 50.5 74.17 From 4f41ca6fb4df293ff5da243fd6cafd4f3e88c2d8 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 9 Jun 2020 10:31:40 +0800 Subject: [PATCH 14/16] audio: update microphone information Update "microphone_characteristics" and "input_snd_device_mic_mapping" Bug: 155053215 Test: manual regression test Signed-off-by: Jasmine Cha Change-Id: I07f0d7025a269a5164b9795c2ce788a18224d012 --- 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 eb27b4b..f6d8c9f 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -140,7 +140,7 @@ frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98" responses="0.26 0.06 -0.08 -0.16 -0.05 0.01 0.17 0.42 0.14 -0.12 -0.10 0.03 0.10 0.10 0.15 0.19 0.22 0.30 0.32 0.38 0.58 0.65 0.66 0.67 0.70 0.72 0.71 0.67 0.64 0.64 0.62 0.58 0.69 1.18 1.43 1.56 1.62 1.62 1.47 1.38 1.29 1.20 1.16 1.08 1.02 0.97 0.90 1.00 0.92 0.93 1.00 0.89 0.83 0.75 0.66 0.52 0.42 0.34 0.14 0.08 -0.02 -0.13 -0.31 -0.26 -0.29 -0.25 -0.20 -0.09 0.14 0.40 0.68 0.91 1.33 1.54 1.66 1.70 1.58 1.47 1.43 1.23 1.14 0.95 0.76 0.56 0.49 0.46 0.55 0.79 0.83 0.72 0.39 -0.08 -0.53 -1.12 -1.54 -1.45 -1.04 -0.31 0.45 0.97 1.28 1.32 1.06 0.89 0.85 1.03 0.97 1.17 1.22 0.87 0.42 0.00 -0.21 -0.30 -0.53 -0.44 -0.29 -0.08 -0.19 -0.13 0.47 1.50 1.52 1.02 0.65 1.49 1.34 1.33 1.61 1.67 1.25 1.44 0.98 1.00 -0.19 -0.70 0.55 2.94 3.57 3.66 4.40 4.83 5.15 4.47 4.13 3.09 3.07 2.74 2.90 2.69 2.24 -0.23 -1.56 -2.65 2.11 4.98 4.40 5.14 4.56 3.83 3.83 5.48 5.16 3.72 5.59 5.17 6.04 5.29 4.75 6.05 5.01 4.38 5.05 4.15 4.29 6.15 5.19 3.46 2.81 3.79 7.34 7.00 4.97 6.03 7.99 7.16 6.91 6.88 8.80 9.80 8.47 9.28 11.02 10.61 8.48 10.60 11.31 8.03 12.39 13.00 11.19 13.69 15.42 14.80 15.64 17.39 15.16 18.50 19.69 20.50 22.19 24.75 27.10 26.67 23.02 23.53 21.02 19.62 15.29 15.92 14.64 14.70 13.45 14.84 16.10 12.79 10.10 11.98 10.10 10.43 11.41 9.03 6.82 8.51 8.93 8.36 9.46 10.04 10.97 10.47 7.52 7.22 6.89 7.20 7.59 7.79 6.69 7.30 7.55 8.43 9.19 10.27 8.05 7.88 18.67 11.77" sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.0212 0.1457 0.0041" /> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8f3d893ae6840a17d69a496c82b037dde406a2ab Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Tue, 16 Jun 2020 15:30:28 +0800 Subject: [PATCH 15/16] [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: I56d8f9e5df87c71c02942979ccb52f0fa8578c30 --- device-walleye.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-walleye.mk b/device-walleye.mk index 36a5483..7d43942 100644 --- a/device-walleye.mk +++ b/device-walleye.mk @@ -39,3 +39,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Thermal HAL PRODUCT_COPY_FILES += \ device/google/muskie/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json + +# Setup wizard overlay packages for ActiveEdge +PRODUCT_PACKAGES += \ + PixelSetupWizardOverlayActiveEdge \ From 29a116fb6ec90c6f12ecbb64365d5b749d0c3fca Mon Sep 17 00:00:00 2001 From: Ken Chen Date: Mon, 22 Jun 2020 01:39:14 +0000 Subject: [PATCH 16/16] Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." 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: Ia86468ae6588134af48609a50fec774166f3b25f --- device-walleye.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-walleye.mk b/device-walleye.mk index 7d43942..36a5483 100644 --- a/device-walleye.mk +++ b/device-walleye.mk @@ -39,7 +39,3 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Thermal HAL PRODUCT_COPY_FILES += \ device/google/muskie/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json - -# Setup wizard overlay packages for ActiveEdge -PRODUCT_PACKAGES += \ - PixelSetupWizardOverlayActiveEdge \