Snap for 8243542 from 198c735e40
to udc-release
Change-Id: Iae5479f0303acf51a9db467956789535d6154224
This commit is contained in:
commit
7684405346
4 changed files with 55 additions and 34 deletions
35
device.mk
35
device.mk
|
@ -54,8 +54,6 @@ PRODUCT_SOONG_NAMESPACES += \
|
||||||
vendor/google_nos/test/system-test-harness \
|
vendor/google_nos/test/system-test-harness \
|
||||||
vendor/google/camera
|
vendor/google/camera
|
||||||
|
|
||||||
DEVICE_USES_EXYNOS_GRALLOC_VERSION := 4
|
|
||||||
|
|
||||||
LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
|
LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
|
||||||
|
|
||||||
# OEM Unlock reporting
|
# OEM Unlock reporting
|
||||||
|
@ -204,13 +202,8 @@ PRODUCT_VENDOR_PROPERTIES += \
|
||||||
# ####################
|
# ####################
|
||||||
|
|
||||||
# Device Manifest, Device Compatibility Matrix for Treble
|
# Device Manifest, Device Compatibility Matrix for Treble
|
||||||
ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4)
|
DEVICE_MANIFEST_FILE := \
|
||||||
DEVICE_MANIFEST_FILE := \
|
device/google/gs201/manifest.xml
|
||||||
device/google/gs201/manifest.xml
|
|
||||||
else
|
|
||||||
DEVICE_MANIFEST_FILE := \
|
|
||||||
device/google/gs201/manifest-gralloc3.xml
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
||||||
DEVICE_MANIFEST_FILE += \
|
DEVICE_MANIFEST_FILE += \
|
||||||
|
@ -450,19 +443,11 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
com.android.future.usb.accessory
|
com.android.future.usb.accessory
|
||||||
|
|
||||||
# for now include gralloc here. should come from hardware/google_devices/exynos5
|
PRODUCT_PACKAGES += \
|
||||||
ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4)
|
android.hardware.graphics.mapper@4.0-impl \
|
||||||
PRODUCT_PACKAGES += \
|
android.hardware.graphics.allocator@4.0-service \
|
||||||
android.hardware.graphics.mapper@4.0-impl \
|
android.hardware.graphics.allocator@4.0-impl \
|
||||||
android.hardware.graphics.allocator@4.0-service \
|
android.hardware.graphics.allocator-V1-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
|
|
||||||
|
|
||||||
# AIDL memtrack
|
# AIDL memtrack
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
@ -856,8 +841,8 @@ SUPPORT_MULTI_SIM := true
|
||||||
SUPPORT_NR := true
|
SUPPORT_NR := true
|
||||||
# Support 5G on both stacks
|
# Support 5G on both stacks
|
||||||
SUPPORT_NR_DS := true
|
SUPPORT_NR_DS := true
|
||||||
# Using IRadio 1.6
|
# Using IRadio 2.0
|
||||||
USE_RADIO_HAL_1_6 := true
|
USE_RADIO_HAL_2_0 := true
|
||||||
|
|
||||||
#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
|
#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
|
||||||
#$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk)
|
#$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk)
|
||||||
|
@ -922,7 +907,7 @@ PRODUCT_PACKAGES += \
|
||||||
android.hardware.audio.effect@7.0-impl \
|
android.hardware.audio.effect@7.0-impl \
|
||||||
android.hardware.soundtrigger@2.3-impl \
|
android.hardware.soundtrigger@2.3-impl \
|
||||||
vendor.google.whitechapel.audio.audioext@3.0-impl \
|
vendor.google.whitechapel.audio.audioext@3.0-impl \
|
||||||
android.hardware.bluetooth.audio@2.1-impl
|
android.hardware.bluetooth.audio-impl \
|
||||||
|
|
||||||
#
|
#
|
||||||
##Audio HAL libraries
|
##Audio HAL libraries
|
||||||
|
|
|
@ -71,15 +71,6 @@
|
||||||
<instance>default</instance>
|
<instance>default</instance>
|
||||||
</interface>
|
</interface>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl">
|
|
||||||
<name>android.hardware.bluetooth.audio</name>
|
|
||||||
<transport>hwbinder</transport>
|
|
||||||
<version>2.1</version>
|
|
||||||
<interface>
|
|
||||||
<name>IBluetoothAudioProvidersFactory</name>
|
|
||||||
<instance>default</instance>
|
|
||||||
</interface>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl">
|
<hal format="hidl">
|
||||||
<name>android.hardware.boot</name>
|
<name>android.hardware.boot</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
|
20
overlay/packages/apps/Settings/res/values/bools.xml
Executable file
20
overlay/packages/apps/Settings/res/values/bools.xml
Executable file
|
@ -0,0 +1,20 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright 2022 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources>
|
||||||
|
<!-- Whether to show a preference item for mobile plan -->
|
||||||
|
<bool name="config_show_mobile_plan">false</bool>
|
||||||
|
</resources>
|
25
overlay/packages/apps/Settings/res/values/config.xml
Executable file
25
overlay/packages/apps/Settings/res/values/config.xml
Executable file
|
@ -0,0 +1,25 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright 2022 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<resources>
|
||||||
|
<!-- Whether to aggregate for network selection list-->
|
||||||
|
<bool name="config_network_selection_list_aggregation_enabled">true</bool>
|
||||||
|
|
||||||
|
<!-- The switch preference's default value of connectivity helper call quality-->
|
||||||
|
<bool name="config_show_connectivity_helper_call_quality">true</bool>
|
||||||
|
<!-- The switch preference's default value of connectivity helper DeviceToDevice-->
|
||||||
|
<bool name="config_show_connectivity_helper_d2d">true</bool>
|
||||||
|
</resources>
|
Loading…
Add table
Add a link
Reference in a new issue