From 205a0a4851e92efc553f7baf8b17a313adff3281 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 16 Feb 2022 22:31:14 -0800 Subject: [PATCH 1/6] Remove stale gralloc3 configs Bug: 220910504 Test: Boots to home Change-Id: I30a68849413b6927365773a52f543e3a032f18fa --- device.mk | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/device.mk b/device.mk index 9580eba0..5bdd98e0 100644 --- a/device.mk +++ b/device.mk @@ -54,8 +54,6 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google_nos/test/system-test-harness \ vendor/google/camera -DEVICE_USES_EXYNOS_GRALLOC_VERSION := 4 - LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 # OEM Unlock reporting @@ -204,13 +202,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # #################### # Device Manifest, Device Compatibility Matrix for Treble -ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4) - DEVICE_MANIFEST_FILE := \ - device/google/gs201/manifest.xml -else - DEVICE_MANIFEST_FILE := \ - device/google/gs201/manifest-gralloc3.xml -endif +DEVICE_MANIFEST_FILE := \ + device/google/gs201/manifest.xml ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ @@ -453,19 +446,10 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000 PRODUCT_PACKAGES += \ com.android.future.usb.accessory -# for now include gralloc here. should come from hardware/google_devices/exynos5 -ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4) - PRODUCT_PACKAGES += \ - android.hardware.graphics.mapper@4.0-impl \ - android.hardware.graphics.allocator@4.0-service \ - android.hardware.graphics.allocator@4.0-impl -else - PRODUCT_PACKAGES += \ - android.hardware.graphics.mapper@2.0-impl \ - android.hardware.graphics.allocator@2.0-service \ - android.hardware.graphics.allocator@2.0-impl \ - gralloc.$(TARGET_BOARD_PLATFORM) -endif +PRODUCT_PACKAGES += \ + android.hardware.graphics.mapper@4.0-impl \ + android.hardware.graphics.allocator@4.0-service \ + android.hardware.graphics.allocator@4.0-impl # AIDL memtrack PRODUCT_PACKAGES += \ From 9e4f342440402cbe5993dbe1ee533daa9519c145 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 16 Feb 2022 22:32:09 -0800 Subject: [PATCH 2/6] Include allocator AIDL service in the build Bug: 220910504 Test: Boots to home Test: VtsHalGraphicsAllocatorAidl_TargetTest Change-Id: Ie169b059d401ce58b217765dbac76b4de9eb2c96 --- device.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 5bdd98e0..e7488a9f 100644 --- a/device.mk +++ b/device.mk @@ -449,7 +449,8 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.graphics.mapper@4.0-impl \ android.hardware.graphics.allocator@4.0-service \ - android.hardware.graphics.allocator@4.0-impl + android.hardware.graphics.allocator@4.0-impl \ + android.hardware.graphics.allocator-V1-service # AIDL memtrack PRODUCT_PACKAGES += \ From 5357ce3a42d5208172dbf6a31c7447f45626a43d Mon Sep 17 00:00:00 2001 From: Tim Lin Date: Fri, 14 Jan 2022 11:54:23 +0800 Subject: [PATCH 3/6] enable IRadio 2.0 Bug: 206348419 Test: make Change-Id: Iae1093aa6f7e9014fe47ae05e023922725885d03 --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index e7488a9f..fcaab543 100644 --- a/device.mk +++ b/device.mk @@ -844,8 +844,8 @@ SUPPORT_MULTI_SIM := true SUPPORT_NR := true # Support 5G on both stacks SUPPORT_NR_DS := true -# Using IRadio 1.6 -USE_RADIO_HAL_1_6 := true +# Using IRadio 2.0 +USE_RADIO_HAL_2_0 := true #$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk) #$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk) From 78497675e4540dacd1d4153b606909c573b0c8b4 Mon Sep 17 00:00:00 2001 From: Josh Wu Date: Sun, 20 Feb 2022 23:10:10 -0800 Subject: [PATCH 4/6] Switch BtAudio to AIDL Test: m Bug: 203490261 Change-Id: I9668afb6549491c65ec193f707ef936c3bb519ae --- device.mk | 2 +- manifest.xml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/device.mk b/device.mk index 7dc6a0e6..8a468d7c 100644 --- a/device.mk +++ b/device.mk @@ -907,7 +907,7 @@ PRODUCT_PACKAGES += \ android.hardware.audio.effect@7.0-impl \ android.hardware.soundtrigger@2.3-impl \ vendor.google.whitechapel.audio.audioext@3.0-impl \ - android.hardware.bluetooth.audio@2.1-impl + android.hardware.bluetooth.audio-impl \ # ##Audio HAL libraries diff --git a/manifest.xml b/manifest.xml index b80598c0..716d5bf1 100644 --- a/manifest.xml +++ b/manifest.xml @@ -71,15 +71,6 @@ default - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - android.hardware.boot hwbinder From e8aabb124f519f55ebcf53dfa73ff19fe5a93c8e Mon Sep 17 00:00:00 2001 From: Josh Wu Date: Sun, 20 Feb 2022 23:10:10 -0800 Subject: [PATCH 5/6] Switch BtAudio to AIDL Test: m Bug: 203490261 Change-Id: I9668afb6549491c65ec193f707ef936c3bb519ae Merged-In: I9668afb6549491c65ec193f707ef936c3bb519ae --- device.mk | 2 +- manifest.xml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/device.mk b/device.mk index fcaab543..cb11e69a 100644 --- a/device.mk +++ b/device.mk @@ -910,7 +910,7 @@ PRODUCT_PACKAGES += \ android.hardware.audio.effect@7.0-impl \ android.hardware.soundtrigger@2.3-impl \ vendor.google.whitechapel.audio.audioext@3.0-impl \ - android.hardware.bluetooth.audio@2.1-impl + android.hardware.bluetooth.audio-impl \ # ##Audio HAL libraries diff --git a/manifest.xml b/manifest.xml index b80598c0..716d5bf1 100644 --- a/manifest.xml +++ b/manifest.xml @@ -71,15 +71,6 @@ default - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - android.hardware.boot hwbinder From 9e3dae66288be0358a4c454ba6807ec604a61912 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Wed, 2 Mar 2022 17:41:32 +0800 Subject: [PATCH 6/6] copy the overlay from gs101 Bug: 221846447 Test: build pass Change-Id: Ia977d59492d00bb5499523ca17cde92fd932292e --- .../apps/Settings/res/values/bools.xml | 20 +++++++++++++++ .../apps/Settings/res/values/config.xml | 25 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100755 overlay/packages/apps/Settings/res/values/bools.xml create mode 100755 overlay/packages/apps/Settings/res/values/config.xml diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml new file mode 100755 index 00000000..4b5496fe --- /dev/null +++ b/overlay/packages/apps/Settings/res/values/bools.xml @@ -0,0 +1,20 @@ + + + + + + false + diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml new file mode 100755 index 00000000..7bd1f0d5 --- /dev/null +++ b/overlay/packages/apps/Settings/res/values/config.xml @@ -0,0 +1,25 @@ + + + + + + true + + + true + + true +