keylayout: update for Android 14 QPR2

* Changes from frameworks/base/data/keyboards/Generic.kl

AndroidProducts.mk

@@ -10,6 +10,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_rpi4_tv.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_rpi4-userdebug \
-    aosp_rpi4_car-userdebug \
-    aosp_rpi4_tv-userdebug
+    aosp_rpi4-trunk_staging-userdebug \
+    aosp_rpi4_car-trunk_staging-userdebug \
+    aosp_rpi4_tv-trunk_staging-userdebug

BoardConfig.mk

@@ -16,13 +16,13 @@ TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := cortex-a72
+TARGET_CPU_VARIANT := generic
 
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a72
+TARGET_2ND_CPU_VARIANT := generic
 
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth

audio/audio_hw.c

@@ -87,7 +87,7 @@ struct alsa_stream_out {
 static int probe_pcm_out_card() {
     FILE *fp;
     char card_node[] = "/proc/asound/card0/id";
-    char card_id[64];
+    char card_id[16];
 
     char card_prop[PROPERTY_VALUE_MAX];
     property_get("persist.audio.device", card_prop, "");

device.mk

@@ -234,7 +234,7 @@ PRODUCT_COPY_FILES += \
 
 # Seccomp
 PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/seccomp_policy/codec2.vendor.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.ext.policy \
+    $(DEVICE_PATH)/seccomp_policy/android.hardware.media.c2-extended-seccomp_policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/android.hardware.media.c2-extended-seccomp_policy \
     $(DEVICE_PATH)/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
     $(DEVICE_PATH)/seccomp_policy/mediaswcodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaswcodec.policy
 
@@ -247,7 +247,7 @@ PRODUCT_PACKAGES += \
 
 # Thermal
 PRODUCT_PACKAGES += \
-    android.hardware.thermal-service.example
+    com.android.hardware.thermal
 
 # USB
 PRODUCT_PACKAGES += \
@@ -263,7 +263,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SOONG_NAMESPACES += external/v4l2_codec2
 
 PRODUCT_PACKAGES += \
-    android.hardware.media.c2@1.0-service-v4l2 \
+    android.hardware.media.c2@1.2-service-v4l2 \
     libc2plugin_store
 
 PRODUCT_COPY_FILES += \

framework_compatibility_matrix.xml

@@ -2,7 +2,7 @@
     <hal format="hidl" optional="true">
         <name>android.hardware.media.c2</name>
         <transport>hwbinder</transport>
-        <version>1.0-2</version>
+        <version>1.2</version>
         <interface>
             <name>IComponentStore</name>
             <instance>ffmpeg</instance>

health/Android.bp

@@ -26,7 +26,7 @@ cc_binary {
         "libhidlbase",
         "liblog",
         "libutils",
-        "android.hardware.health-V2-ndk",
+        "android.hardware.health-V3-ndk",
     ],
     overrides: ["charger"],
 }

health/android.hardware.health-service.rpi.xml

@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.health</name>
-        <version>2</version>
+        <version>3</version>
         <fqname>IHealth/default</fqname>
     </hal>
 </manifest>

keylayout/Generic.kl

@@ -324,7 +324,7 @@ key 362   GUIDE
 # key 365 "KEY_EPG"
 key 366   DVR
 # key 367 "KEY_MHP"
-# key 368 "KEY_LANGUAGE"
+key 368   LANGUAGE_SWITCH
 # key 369 "KEY_TITLE"
 key 370   CAPTIONS
 # key 371 "KEY_ANGLE"
@@ -436,17 +436,17 @@ key 141   POWER
 key 174   BACK
 
 # Keys defined by HID usages
-key usage 0x0c0067 WINDOW
-key usage 0x0c006F BRIGHTNESS_UP
-key usage 0x0c0070 BRIGHTNESS_DOWN
-key usage 0x0c0079 KEYBOARD_BACKLIGHT_UP
-key usage 0x0c007A KEYBOARD_BACKLIGHT_DOWN
-key usage 0x0c007C KEYBOARD_BACKLIGHT_TOGGLE
-key usage 0x0c0173 MEDIA_AUDIO_TRACK
-key usage 0x0c019C PROFILE_SWITCH
-key usage 0x0c01A2 ALL_APPS
-key usage 0x0d0044 STYLUS_BUTTON_PRIMARY
-key usage 0x0d005a STYLUS_BUTTON_SECONDARY
+key usage 0x0c0067 WINDOW                    FALLBACK_USAGE_MAPPING
+key usage 0x0c006F BRIGHTNESS_UP             FALLBACK_USAGE_MAPPING
+key usage 0x0c0070 BRIGHTNESS_DOWN           FALLBACK_USAGE_MAPPING
+key usage 0x0c0079 KEYBOARD_BACKLIGHT_UP     FALLBACK_USAGE_MAPPING
+key usage 0x0c007A KEYBOARD_BACKLIGHT_DOWN   FALLBACK_USAGE_MAPPING
+key usage 0x0c007C KEYBOARD_BACKLIGHT_TOGGLE FALLBACK_USAGE_MAPPING
+key usage 0x0c0173 MEDIA_AUDIO_TRACK         FALLBACK_USAGE_MAPPING
+key usage 0x0c019C PROFILE_SWITCH            FALLBACK_USAGE_MAPPING
+key usage 0x0c01A2 ALL_APPS                  FALLBACK_USAGE_MAPPING
+key usage 0x0d0044 STYLUS_BUTTON_PRIMARY     FALLBACK_USAGE_MAPPING
+key usage 0x0d005a STYLUS_BUTTON_SECONDARY   FALLBACK_USAGE_MAPPING
 
 # Joystick and game controller axes.
 # Axes that are not mapped will be assigned generic axis numbers by the input subsystem.

ramdisk/init.rpi4.rc

@@ -12,9 +12,6 @@ on post-fs-data
     mkdir /data/vendor/wifi/wpa 0770 wifi wifi
     mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
 
-    # Set indication (checked by vold) that we have finished this action
-    setprop vold.post_fs_data_done 1
-
 on property:sys.boot_completed=1
     # Reinit lmkd to reconfigure lmkd properties
     setprop lmkd.reinit 1

seccomp_policy/android.hardware.media.c2-extended-seccomp_policy

@@ -9,7 +9,9 @@ fstatat64: 1
 fstatfs64: 1
 getcwd: 1
 getdents64: 1
+getegid32: 1
 geteuid32: 1
+getgid32: 1
 getuid32: 1
 mmap2: 1
 open: 1

sepolicy/file_contexts

@@ -51,4 +51,4 @@
 /vendor/bin/hw/android\.hardware\.usb\.gadget@1\.2-service\.rpi              u:object_r:hal_usb_gadget_default_exec:s0
 
 # V4L2
-/vendor/bin/hw/android\.hardware\.media\.c2@1\.0-service-v4l2(.*)?           u:object_r:mediacodec_exec:s0
+/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-v4l2(.*)?           u:object_r:mediacodec_exec:s0

vendor.prop

@@ -87,3 +87,6 @@ ro.vendor.v4l2_codec2.encode_concurrent_instances=8
 # Wifi
 wifi.interface=wlan0
 
+# Window extensions
+persist.settings.large_screen_opt.enabled=true
+