From 9441a3a525365f21bb687f77922236e62fa6a559 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Sat, 1 Oct 2022 11:07:59 +0530 Subject: common.kl: Use frameworks/base/data/keyboards/Generic.kl instead Delete common.kl and use upstream generic keylayout from frameworks/base/data/keyboards/Generic.kl, instead of maintaining an out dated keylayout locally. Signed-off-by: Amit Pundir Change-Id: I630e670de262b2fc5f859dcd382d587e846d51c5 --- common.kl | 113 -------------------------------------------- hikey/device-hikey.mk | 2 +- hikey960/device-hikey960.mk | 2 +- 3 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 common.kl diff --git a/common.kl b/common.kl deleted file mode 100644 index a1302da2..00000000 --- a/common.kl +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright (C) 2010 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. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 399 GRAVE -key 1 BACK -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 158 BACK WAKE_DROPPED -key 230 SOFT_RIGHT WAKE -key 60 SOFT_RIGHT WAKE -key 107 ENDCALL WAKE_DROPPED -key 62 ENDCALL WAKE_DROPPED -key 229 MENU WAKE_DROPPED -key 139 MENU WAKE_DROPPED -key 59 MENU WAKE_DROPPED -key 127 SEARCH WAKE_DROPPED -key 217 SEARCH WAKE_DROPPED -key 228 POUND -key 227 STAR -key 231 CALL WAKE_DROPPED -key 61 CALL WAKE_DROPPED -key 232 DPAD_CENTER WAKE_DROPPED -key 108 DPAD_DOWN WAKE_DROPPED -key 103 DPAD_UP WAKE_DROPPED -key 102 HOME WAKE -key 105 DPAD_LEFT WAKE_DROPPED -key 106 DPAD_RIGHT WAKE_DROPPED -key 115 VOLUME_UP -key 114 VOLUME_DOWN -key 116 POWER WAKE -key 212 CAMERA - -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 43 BACKSLASH - -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 14 DEL - -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 28 ENTER - -key 56 ALT_LEFT -key 100 ALT_RIGHT -key 42 SHIFT_LEFT -key 54 SHIFT_RIGHT -key 15 TAB -key 57 SPACE -key 150 EXPLORER -key 155 ENVELOPE - -key 12 MINUS -key 13 EQUALS -key 215 AT - - -key 82 MENU WAKE diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk index cc94c401..55eaf72c 100644 --- a/hikey/device-hikey.mk +++ b/hikey/device-hikey.mk @@ -22,7 +22,7 @@ PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ device/linaro/hikey/init.hikey.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.power.rc \ device/linaro/hikey/hikey/init.hikey.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.usb.rc \ device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ - device/linaro/hikey/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey.kl + frameworks/base/data/keyboards/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey.kl # Build HiKey HDMI audio HAL PRODUCT_PACKAGES += audio.primary.hikey diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index b4d43b3f..d3118653 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -39,7 +39,7 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_VENDOR)/etc device/linaro/hikey/init.hikey960.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.power.rc \ device/linaro/hikey/hikey960/init.hikey960.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \ device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ - device/linaro/hikey/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey960.kl \ + frameworks/base/data/keyboards/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey960.kl \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml -- cgit v1.2.3 From f707942776d45d238e7fc143afa4a531c1cbdde3 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Mon, 3 Oct 2022 18:22:43 +0530 Subject: product.prop: Update bluetooth properties Set default Bluetooth class of device and update LE Audio profile properties to match spec and implementation. Copied from Cuttlefish. Signed-off-by: Amit Pundir Change-Id: Ic8a85d55888ecf7eeb24cd0c9d604d0d43a58ebc --- product.prop | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/product.prop b/product.prop index 2499291e..29b74bba 100644 --- a/product.prop +++ b/product.prop @@ -1,11 +1,22 @@ # System props to enable aac vbr feature persist.bluetooth.a2dp_aac.vbr_supported=true + +# Set the Bluetooth Class of Device +# Service Field: 0x5A -> 90 +# Bit 17: Networking +# Bit 19: Capturing +# Bit 20: Object Transfer +# Bit 22: Telephony +# MAJOR_CLASS: 0x02 -> 2 (Phone) +# MINOR_CLASS: 0x0C -> 12 (Smart Phone) +bluetooth.device.class_of_device=90,2,12 + # Set supported Bluetooth profiles to enabled bluetooth.profile.asha.central.enabled=true bluetooth.profile.a2dp.source.enabled=true bluetooth.profile.avrcp.target.enabled=true bluetooth.profile.bap.broadcast.assist.enabled=true -bluetooth.profile.bap.unicast.server.enabled=true +bluetooth.profile.bap.unicast.client.enabled=true bluetooth.profile.bas.client.enabled=true bluetooth.profile.csip.set_coordinator.enabled=true bluetooth.profile.gatt.enabled=true @@ -19,6 +30,5 @@ bluetooth.profile.opp.enabled=true bluetooth.profile.pan.nap.enabled=true bluetooth.profile.pan.panu.enabled=true bluetooth.profile.pbap.server.enabled=true -bluetooth.profile.sap.server.enabled=true -bluetooth.profile.tbs.server.enabled=true -bluetooth.profile.vc.server.enabled=true +bluetooth.profile.ccp.server.enabled=true +bluetooth.profile.vcp.controller.enabled=true -- cgit v1.2.3 From f7f8d93f06064ce6d3f176fff8673f740829a706 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 5 Oct 2022 17:36:20 +0530 Subject: product.prop: Use the ?= operator so BT properties can be overridden System properties set with the "=" operator cannot be overriden. This device is used elsewhere in the system and some of the properties need to be overridden. The "?=" operator will use the assigned value if no other values are assigned elsewhere, allowing for overrides. Copied from Coral. Signed-off-by: Amit Pundir Change-Id: I94f12152e778531525e7cdc6b0c9f835b9f665e4 --- product.prop | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/product.prop b/product.prop index 29b74bba..d703af95 100644 --- a/product.prop +++ b/product.prop @@ -12,23 +12,24 @@ persist.bluetooth.a2dp_aac.vbr_supported=true bluetooth.device.class_of_device=90,2,12 # Set supported Bluetooth profiles to enabled -bluetooth.profile.asha.central.enabled=true -bluetooth.profile.a2dp.source.enabled=true -bluetooth.profile.avrcp.target.enabled=true -bluetooth.profile.bap.broadcast.assist.enabled=true -bluetooth.profile.bap.unicast.client.enabled=true -bluetooth.profile.bas.client.enabled=true -bluetooth.profile.csip.set_coordinator.enabled=true -bluetooth.profile.gatt.enabled=true -bluetooth.profile.hap.client.enabled=true -bluetooth.profile.hfp.ag.enabled=true -bluetooth.profile.hid.device.enabled=true -bluetooth.profile.hid.host.enabled=true -bluetooth.profile.map.server.enabled=true -bluetooth.profile.mcp.server.enabled=true -bluetooth.profile.opp.enabled=true -bluetooth.profile.pan.nap.enabled=true -bluetooth.profile.pan.panu.enabled=true -bluetooth.profile.pbap.server.enabled=true -bluetooth.profile.ccp.server.enabled=true -bluetooth.profile.vcp.controller.enabled=true +bluetooth.profile.asha.central.enabled?=true +bluetooth.profile.a2dp.source.enabled?=true +bluetooth.profile.avrcp.target.enabled?=true +bluetooth.profile.bap.broadcast.assist.enabled?=true +bluetooth.profile.bap.unicast.client.enabled?=true +bluetooth.profile.bas.client.enabled?=true +bluetooth.profile.csip.set_coordinator.enabled?=true +bluetooth.profile.gatt.enabled?=true +bluetooth.profile.hap.client.enabled?=true +bluetooth.profile.hfp.ag.enabled?=true +bluetooth.profile.hid.device.enabled?=true +bluetooth.profile.hid.host.enabled?=true +bluetooth.profile.map.server.enabled?=true +bluetooth.profile.mcp.server.enabled?=true +bluetooth.profile.opp.enabled?=true +bluetooth.profile.pan.nap.enabled?=true +bluetooth.profile.pan.panu.enabled?=true +bluetooth.profile.pbap.server.enabled?=true +bluetooth.profile.sap.server.enabled?=true +bluetooth.profile.ccp.server.enabled?=true +bluetooth.profile.vcp.controller.enabled?=true -- cgit v1.2.3