mkimg: adjust flashable image size

* It's been reported that 14848MiB = 15569256448 bytes is still too
  large to fit some 16GB storage devices.
* 15360000000 bytes is dividable by 16384, 4096, 2048, 1024, 512, ...
* Fixes 60497874a8.

BoardConfig.mk

@@ -13,15 +13,32 @@ TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
 TARGET_CPU_VARIANT := cortex-a76
 
+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 := generic
+
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
 
 # Bootloader
 TARGET_NO_BOOTLOADER := true
 
+# Camera
+BOARD_LIBCAMERA_IPAS := rpi/pisp
+BOARD_LIBCAMERA_PIPELINES := rpi/pisp
+BOARD_LIBCAMERA_USES_MESON_BUILD := true
+
 # Display
 TARGET_SCREEN_DENSITY := 240
 
+# Graphics
+BOARD_MESA3D_BUILD_LIBGBM := true
+BOARD_MESA3D_USES_MESON_BUILD := true
+BOARD_MESA3D_GALLIUM_DRIVERS := vc4 v3d
+BOARD_MESA3D_VULKAN_DRIVERS := broadcom
+
 # Kernel
 BOARD_CUSTOM_BOOTIMG := true
 BOARD_CUSTOM_BOOTIMG_MK := $(DEVICE_PATH)/mkbootimg.mk
@@ -30,7 +47,7 @@ BOARD_KERNEL_CMDLINE := console=ttyAMA10,115200 no_console_suspend root=/dev/ram
 # Manifest
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(DEVICE_PATH)/framework_compatibility_matrix.xml
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
-PRODUCT_MANIFEST_FILES := $(DEVICE_PATH)/product_manifest.xml
+DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml
 
 # Partition sizes
 BOARD_FLASH_BLOCK_SIZE := 4096
@@ -57,6 +74,7 @@ BOARD_SEPOLICY_DIRS += device/brcm/rpi5/sepolicy
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
 # Treble
+BOARD_VNDK_VERSION := current
 TARGET_COPY_OUT_VENDOR := vendor
 
 # Virtualization
@@ -68,5 +86,5 @@ BOARD_HOSTAPD_DRIVER := NL80211
 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
+WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X
-BOARD_KERNEL_CMDLINE += androidboot.wificountrycode=00

README.md

@@ -1 +1 @@
-Raspberry Vanilla AOSP 15 device configuration for Raspberry Pi 5.
+Raspberry Vanilla AOSP 14 device configuration for Raspberry Pi 5.

aosp_rpi5.mk

@@ -4,28 +4,19 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PATH := device/brcm/rpi5
-
 # Inherit device configuration
 $(call inherit-product, device/brcm/rpi5/device.mk)
 
 PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
-
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-$(call enforce-product-packages-exist,)
-
-# Keylayout
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/keylayout/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl
 
 # Overlays
 PRODUCT_PACKAGES += \
     AndroidRpiOverlay \
-    BluetoothRpiOverlay \
-    SettingsProviderRpiOverlay \
     SettingsRpiOverlay \
+    SettingsProviderRpiOverlay \
     SystemUIRpiOverlay \
     WifiRpiOverlay
 

aosp_rpi5_car.mk

@@ -4,30 +4,30 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PATH := device/brcm/rpi5
-
 # Inherit device configuration
 $(call inherit-product, device/brcm/rpi5/device.mk)
 
+DEVICE_PATH_CAR := device/brcm/rpi5/car
+
 PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
 PRODUCT_CHARACTERISTICS := automotive,nosdcard
-
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
-$(call enforce-product-packages-exist,Bluetooth Keyguard Launcher2 OverviewApp RotaryIME RotaryPlayground libnfc_ndef libvariablespeed pppd)
 
 # Audio
 PRODUCT_PACKAGES += \
     android.hardware.automotive.audiocontrol-service.example
 
 PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/car/car_audio_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/car_audio_configuration.xml
+    $(DEVICE_PATH_CAR)/car_audio_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/car_audio_configuration.xml
 
 # Bluetooth
 PRODUCT_VENDOR_PROPERTIES += \
     bluetooth.device.class_of_device=38,4,8 \
+    bluetooth.profile.a2dp.source.enabled=false \
     bluetooth.profile.asha.central.enabled=false \
+    bluetooth.profile.avrcp.target.enabled=false \
     bluetooth.profile.bap.broadcast.assist.enabled=false \
     bluetooth.profile.bap.unicast.client.enabled=false \
     bluetooth.profile.bas.client.enabled=false \
@@ -65,7 +65,7 @@ PRODUCT_PACKAGES += \
 
 # Display
 PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/car/display_settings.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display_settings.xml
+    $(DEVICE_PATH_CAR)/display_settings.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display_settings.xml
 
 # EVS
 ENABLE_CAREVSSERVICE_SAMPLE := true
@@ -74,11 +74,7 @@ ENABLE_EVS_SERVICE := true
 ENABLE_REAR_VIEW_CAMERA_SAMPLE := true
 
 PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/car/evs_config_override.json:${TARGET_COPY_OUT_VENDOR}/etc/automotive/evs/config_override.json
-
-# Keylayout
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/keylayout/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl
+    $(DEVICE_PATH_CAR)/evs_config_override.json:${TARGET_COPY_OUT_VENDOR}/etc/automotive/evs/config_override.json
 
 # Occupant awareness
 PRODUCT_PACKAGES += \
@@ -89,7 +85,6 @@ include packages/services/Car/car_product/occupant_awareness/OccupantAwareness.m
 # Overlays
 PRODUCT_PACKAGES += \
     AndroidRpiOverlay \
-    BluetoothRpiOverlay \
     CarServiceRpiOverlay \
     SettingsProviderRpiOverlay \
     WifiRpiOverlay

aosp_rpi5_tv.mk

@@ -4,16 +4,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PATH := device/brcm/rpi5
-
 # Inherit device configuration
 $(call inherit-product, device/brcm/rpi5/device.mk)
 
 PRODUCT_AAPT_PREF_CONFIG := tvdpi
 PRODUCT_CHARACTERISTICS := tv
-
 $(call inherit-product, device/google/atv/products/atv_base.mk)
-$(call enforce-product-packages-exist,)
 
 # Android TV
 PRODUCT_PACKAGES += \
@@ -31,14 +27,9 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_COPY_FILES += \
     device/google/atv/products/bootanimations/bootanimation.zip:$(TARGET_COPY_OUT_SYSTEM)/media/bootanimation.zip
 
-# Keylayout
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/keylayout/Generic-tv.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl
-
 # Overlays
 PRODUCT_PACKAGES += \
     AndroidTvRpiOverlay \
-    BluetoothRpiOverlay \
     SettingsProviderTvRpiOverlay \
     WifiRpiOverlay
 

audio/audio_hw.c

@@ -93,7 +93,7 @@ static int probe_pcm_out_card() {
     char card_id[16];
 
     char card_prop[PROPERTY_VALUE_MAX];
-    property_get("persist.vendor.audio.device", card_prop, "");
+    property_get("persist.audio.device", card_prop, "");
 
     for (int i = 0; i < 5; i++) {
         snprintf(card_node, sizeof(card_node), "/proc/asound/card%d/id", i);
@@ -121,18 +121,18 @@ static int probe_pcm_out_card() {
 static int get_pcm_card()
 {
     char card[PROPERTY_VALUE_MAX];
-    property_get("persist.vendor.audio.pcm.card.auto", card, "false");
+    property_get("persist.audio.pcm.card.auto", card, "false");
     if (!strcmp(card, "true"))
         return probe_pcm_out_card();
 
-    property_get("persist.vendor.audio.pcm.card", card, "0");
+    property_get("persist.audio.pcm.card", card, "0");
     return atoi(card);
 }
 
 static int get_pcm_device()
 {
     char device[PROPERTY_VALUE_MAX];
-    property_get("persist.vendor.audio.pcm.device", device, "0");
+    property_get("persist.audio.pcm.device", device, "0");
     return atoi(device);
 }
 

audio/audio_hw_hdmi.c

@@ -89,7 +89,7 @@ struct alsa_stream_out {
 
 static void get_alsa_device_name(char *name) {
     char hdmi_device[PROPERTY_VALUE_MAX];
-    property_get("persist.vendor.audio.hdmi.device", hdmi_device, "vc4hdmi0");
+    property_get("persist.audio.hdmi.device", hdmi_device, "vc4hdmi0");
 
     // use card configured in vc4-hdmi.conf to get IEC958 subframe conversion
     sprintf(name, "default:CARD=%s", hdmi_device);

bluetooth/Android.bp

@@ -1,56 +0,0 @@
-// Copyright (C) 2020 The Android Open Source Project
-// Copyright (C) 2024 KonstaKANG
-//
-// SPDX-License-Identifier: Apache-2.0
-
-cc_binary {
-    name: "android.hardware.bluetooth-service.rpi",
-    relative_install_path: "hw",
-    vendor: true,
-    srcs: [
-        "BluetoothHci.cpp",
-        "main.cpp",
-        "net_bluetooth_mgmt.cpp",
-    ],
-    static_libs: [
-        "android.hardware.bluetooth.async",
-        "android.hardware.bluetooth.hci",
-    ],
-    shared_libs: [
-        "android.hardware.bluetooth-V1-ndk",
-        "libbase",
-        "libbinder_ndk",
-        "liblog",
-        "libutils",
-    ],
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.bluetooth-service.rpi.rc",
-    src: "android.hardware.bluetooth-service.rpi.rc",
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.bluetooth-service.rpi.xml",
-    src: "android.hardware.bluetooth-service.rpi.xml",
-    sub_dir: "vintf",
-    installable: false,
-}
-
-apex {
-    name: "com.android.hardware.bluetooth.rpi5",
-    manifest: "apex_manifest.json",
-    file_contexts: "apex_file_contexts",
-    key: "com.android.hardware.key",
-    certificate: ":com.android.hardware.certificate",
-    updatable: false,
-    vendor: true,
-
-    binaries: ["android.hardware.bluetooth-service.rpi"],
-    prebuilts: [
-        "android.hardware.bluetooth-service.rpi.rc",
-        "android.hardware.bluetooth-service.rpi.xml",
-    ],
-}

bluetooth/BluetoothHci.cpp

@@ -1,227 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2024 KonstaKANG
- *
- * 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.
- */
-
-#define LOG_TAG "android.hardware.bluetooth.service.rpi"
-
-#include "BluetoothHci.h"
-
-#include "log/log.h"
-
-using namespace ::android::hardware::bluetooth::hci;
-using namespace ::android::hardware::bluetooth::async;
-using aidl::android::hardware::bluetooth::Status;
-
-namespace aidl::android::hardware::bluetooth::impl {
-
-void OnDeath(void* cookie);
-
-class BluetoothDeathRecipient {
- public:
-  BluetoothDeathRecipient(BluetoothHci* hci) : mHci(hci) {}
-
-  void LinkToDeath(const std::shared_ptr<IBluetoothHciCallbacks>& cb) {
-    mCb = cb;
-    clientDeathRecipient_ = AIBinder_DeathRecipient_new(OnDeath);
-    auto linkToDeathReturnStatus = AIBinder_linkToDeath(
-        mCb->asBinder().get(), clientDeathRecipient_, this /* cookie */);
-    LOG_ALWAYS_FATAL_IF(linkToDeathReturnStatus != STATUS_OK,
-                        "Unable to link to death recipient");
-  }
-
-  void UnlinkToDeath(const std::shared_ptr<IBluetoothHciCallbacks>& cb) {
-    LOG_ALWAYS_FATAL_IF(cb != mCb, "Unable to unlink mismatched pointers");
-  }
-
-  void serviceDied() {
-    if (mCb != nullptr && !AIBinder_isAlive(mCb->asBinder().get())) {
-      ALOGE("Bluetooth remote service has died");
-    } else {
-      ALOGE("BluetoothDeathRecipient::serviceDied called but service not dead");
-      return;
-    }
-    {
-      std::lock_guard<std::mutex> guard(mHasDiedMutex);
-      has_died_ = true;
-    }
-    mHci->close();
-  }
-  BluetoothHci* mHci;
-  std::shared_ptr<IBluetoothHciCallbacks> mCb;
-  AIBinder_DeathRecipient* clientDeathRecipient_;
-  bool getHasDied() {
-    std::lock_guard<std::mutex> guard(mHasDiedMutex);
-    return has_died_;
-  }
-
- private:
-  std::mutex mHasDiedMutex;
-  bool has_died_{false};
-};
-
-void OnDeath(void* cookie) {
-  auto* death_recipient = static_cast<BluetoothDeathRecipient*>(cookie);
-  death_recipient->serviceDied();
-}
-
-BluetoothHci::BluetoothHci() {
-  mDeathRecipient = std::make_shared<BluetoothDeathRecipient>(this);
-}
-
-ndk::ScopedAStatus BluetoothHci::initialize(
-    const std::shared_ptr<IBluetoothHciCallbacks>& cb) {
-  ALOGI(__func__);
-
-  if (cb == nullptr) {
-    ALOGE("cb == nullptr! -> Unable to call initializationComplete(ERR)");
-    return ndk::ScopedAStatus::fromServiceSpecificError(STATUS_BAD_VALUE);
-  }
-
-  HalState old_state = HalState::READY;
-  {
-    std::lock_guard<std::mutex> guard(mStateMutex);
-    if (mState != HalState::READY) {
-      old_state = mState;
-    } else {
-      mState = HalState::INITIALIZING;
-    }
-  }
-
-  if (old_state != HalState::READY) {
-    ALOGE("initialize: Unexpected State %d", static_cast<int>(old_state));
-    close();
-    cb->initializationComplete(Status::ALREADY_INITIALIZED);
-    return ndk::ScopedAStatus::ok();
-  }
-
-  mCb = cb;
-  management_.reset(new NetBluetoothMgmt);
-  mFd = management_->openHci();
-  if (mFd < 0) {
-    management_.reset();
-
-    ALOGI("Unable to open Linux interface.");
-    mState = HalState::READY;
-    cb->initializationComplete(Status::UNABLE_TO_OPEN_INTERFACE);
-    return ndk::ScopedAStatus::ok();
-  }
-
-  mDeathRecipient->LinkToDeath(mCb);
-
-  mH4 = std::make_shared<H4Protocol>(
-      mFd,
-      [](const std::vector<uint8_t>& /* raw_command */) {
-        LOG_ALWAYS_FATAL("Unexpected command!");
-      },
-      [this](const std::vector<uint8_t>& raw_acl) {
-        mCb->aclDataReceived(raw_acl);
-      },
-      [this](const std::vector<uint8_t>& raw_sco) {
-        mCb->scoDataReceived(raw_sco);
-      },
-      [this](const std::vector<uint8_t>& raw_event) {
-        mCb->hciEventReceived(raw_event);
-      },
-      [this](const std::vector<uint8_t>& raw_iso) {
-        mCb->isoDataReceived(raw_iso);
-      },
-      [this]() {
-        ALOGI("HCI socket device disconnected");
-        mFdWatcher.StopWatchingFileDescriptors();
-      });
-  mFdWatcher.WatchFdForNonBlockingReads(mFd,
-                                        [this](int) { mH4->OnDataReady(); });
-
-  {
-    std::lock_guard<std::mutex> guard(mStateMutex);
-    mState = HalState::ONE_CLIENT;
-  }
-  ALOGI("initialization complete");
-  auto status = mCb->initializationComplete(Status::SUCCESS);
-  if (!status.isOk()) {
-    if (!mDeathRecipient->getHasDied()) {
-      ALOGE("Error sending init callback, but no death notification");
-    }
-    close();
-    return ndk::ScopedAStatus::fromServiceSpecificError(
-        STATUS_FAILED_TRANSACTION);
-  }
-
-  return ndk::ScopedAStatus::ok();
-}
-
-ndk::ScopedAStatus BluetoothHci::close() {
-  ALOGI(__func__);
-  {
-    std::lock_guard<std::mutex> guard(mStateMutex);
-    if (mState != HalState::ONE_CLIENT) {
-      LOG_ALWAYS_FATAL_IF(mState == HalState::INITIALIZING,
-                          "mState is INITIALIZING");
-      ALOGI("Already closed");
-      return ndk::ScopedAStatus::ok();
-    }
-    mState = HalState::CLOSING;
-  }
-
-  mFdWatcher.StopWatchingFileDescriptors();
-
-  management_->closeHci();
-
-  {
-    std::lock_guard<std::mutex> guard(mStateMutex);
-    mState = HalState::READY;
-    mH4 = nullptr;
-  }
-  return ndk::ScopedAStatus::ok();
-}
-
-ndk::ScopedAStatus BluetoothHci::sendHciCommand(
-    const std::vector<uint8_t>& packet) {
-  return send(PacketType::COMMAND, packet);
-}
-
-ndk::ScopedAStatus BluetoothHci::sendAclData(
-    const std::vector<uint8_t>& packet) {
-  return send(PacketType::ACL_DATA, packet);
-}
-
-ndk::ScopedAStatus BluetoothHci::sendScoData(
-    const std::vector<uint8_t>& packet) {
-  return send(PacketType::SCO_DATA, packet);
-}
-
-ndk::ScopedAStatus BluetoothHci::sendIsoData(
-    const std::vector<uint8_t>& packet) {
-  return send(PacketType::ISO_DATA, packet);
-}
-
-ndk::ScopedAStatus BluetoothHci::send(PacketType type,
-    const std::vector<uint8_t>& v) {
-  if (v.empty()) {
-    ALOGE("Packet is empty, no data was found to be sent");
-    return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
-  }
-
-  std::lock_guard<std::mutex> guard(mStateMutex);
-  if (mH4 == nullptr) {
-    return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);
-  }
-
-  mH4->Send(type, v);
-  return ndk::ScopedAStatus::ok();
-}
-
-}  // namespace aidl::android::hardware::bluetooth::impl

bluetooth/BluetoothHci.h

@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2024 KonstaKANG
- *
- * 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.
- */
-
-#pragma once
-
-#include <aidl/android/hardware/bluetooth/BnBluetoothHci.h>
-#include <aidl/android/hardware/bluetooth/IBluetoothHciCallbacks.h>
-
-#include "async_fd_watcher.h"
-#include "h4_protocol.h"
-#include "net_bluetooth_mgmt.h"
-
-namespace aidl::android::hardware::bluetooth::impl {
-
-class BluetoothDeathRecipient;
-
-// This Bluetooth HAL implementation connects with a serial port at dev_path_.
-class BluetoothHci : public BnBluetoothHci {
- public:
-  BluetoothHci();
-
-  ndk::ScopedAStatus initialize(
-      const std::shared_ptr<IBluetoothHciCallbacks>& cb) override;
-
-  ndk::ScopedAStatus sendHciCommand(
-      const std::vector<uint8_t>& packet) override;
-
-  ndk::ScopedAStatus sendAclData(const std::vector<uint8_t>& packet) override;
-
-  ndk::ScopedAStatus sendScoData(const std::vector<uint8_t>& packet) override;
-
-  ndk::ScopedAStatus sendIsoData(const std::vector<uint8_t>& packet) override;
-
-  ndk::ScopedAStatus close() override;
-
- private:
-  int mFd{-1};
-  std::shared_ptr<IBluetoothHciCallbacks> mCb = nullptr;
-
-  std::shared_ptr<::android::hardware::bluetooth::hci::H4Protocol> mH4;
-
-  std::shared_ptr<BluetoothDeathRecipient> mDeathRecipient;
-
-  ::android::hardware::bluetooth::async::AsyncFdWatcher mFdWatcher;
-
-  [[nodiscard]] ndk::ScopedAStatus send(
-      ::android::hardware::bluetooth::hci::PacketType type,
-      const std::vector<uint8_t>& packet);
-  std::unique_ptr<NetBluetoothMgmt> management_{};
-
-  // Don't close twice or open before close is complete
-  std::mutex mStateMutex;
-  enum class HalState {
-    READY,
-    INITIALIZING,
-    ONE_CLIENT,
-    CLOSING,
-  } mState{HalState::READY};
-};
-
-}  // namespace aidl::android::hardware::bluetooth::impl

bluetooth/android.hardware.bluetooth-service.rpi.rc

@@ -1,6 +0,0 @@
-service vendor.bluetooth-rpi /apex/com.android.hardware.bluetooth.rpi5/bin/hw/android.hardware.bluetooth-service.rpi
-    class hal
-    capabilities BLOCK_SUSPEND NET_ADMIN SYS_NICE
-    user bluetooth
-    group bluetooth
-    task_profiles HighPerformance

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

@@ -1,6 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="aidl">
-        <name>android.hardware.bluetooth</name>
-        <fqname>IBluetoothHci/default</fqname>
-    </hal>
-</manifest>

bluetooth/apex_file_contexts

@@ -1,3 +0,0 @@
-(/.*)?                                             u:object_r:vendor_file:s0
-/etc(/.*)?                                         u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.bluetooth-service\.rpi  u:object_r:hal_bluetooth_default_exec:s0

bluetooth/apex_manifest.json

@@ -1,4 +0,0 @@
-{
-    "name": "com.android.hardware.bluetooth.rpi5",
-    "version": 1
-}

bluetooth/main.cpp

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2024 KonstaKANG
- *
- * 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.
- */
-
-#include "BluetoothHci.h"
-
-#include <android-base/logging.h>
-#include <android/binder_manager.h>
-#include <android/binder_process.h>
-
-using ::aidl::android::hardware::bluetooth::impl::BluetoothHci;
-
-int main() {
-    ABinderProcess_setThreadPoolMaxThreadCount(0);
-    std::shared_ptr<BluetoothHci> bluetooth = ndk::SharedRefBase::make<BluetoothHci>();
-
-    const std::string instance = std::string() + BluetoothHci::descriptor + "/default";
-    binder_status_t status = AServiceManager_addService(bluetooth->asBinder().get(), instance.c_str());
-    CHECK(status == STATUS_OK);
-
-    ABinderProcess_joinThreadPool();
-    return EXIT_FAILURE;  // should not reach
-}

bluetooth/net_bluetooth_mgmt.cpp

@@ -1,278 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2024 KonstaKANG
- *
- * 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.
- */
-
-#define LOG_TAG "android.hardware.bluetooth.service.rpi"
-
-#include "net_bluetooth_mgmt.h"
-
-#include <fcntl.h>
-#include <log/log.h>
-#include <poll.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-#include <cerrno>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-
-// Definitions imported from <linux/net/bluetooth/bluetooth.h>
-#define BTPROTO_HCI 1
-
-// Definitions imported from <linux/net/bluetooth/hci_sock.h>
-#define HCI_CHANNEL_USER 1
-#define HCI_CHANNEL_CONTROL 3
-#define HCI_DEV_NONE 0xffff
-
-struct sockaddr_hci {
-  sa_family_t hci_family;
-  unsigned short hci_dev;
-  unsigned short hci_channel;
-};
-
-// Definitions imported from <linux/net/bluetooth/mgmt.h>
-#define MGMT_OP_READ_INDEX_LIST 0x0003
-#define MGMT_EV_INDEX_ADDED 0x0004
-#define MGMT_EV_CMD_COMPLETE 0x0001
-#define MGMT_PKT_SIZE_MAX 1024
-#define MGMT_INDEX_NONE 0xFFFF
-#define WRITE_NO_INTR(fn) \
-  do {                  \
-  } while ((fn) == -1 && errno == EINTR)
-
-struct mgmt_pkt {
-  uint16_t opcode;
-  uint16_t index;
-  uint16_t len;
-  uint8_t data[MGMT_PKT_SIZE_MAX];
-} __attribute__((packed));
-
-struct mgmt_ev_read_index_list {
-  uint16_t opcode;
-  uint8_t status;
-  uint16_t num_controllers;
-  uint16_t index[];
-} __attribute__((packed));
-
-namespace aidl::android::hardware::bluetooth::impl {
-
-// Wait indefinitely for the selected HCI interface to be enabled in the
-// bluetooth driver.
-int NetBluetoothMgmt::waitHciDev(int hci_interface) {
-  ALOGI("waiting for hci interface %d", hci_interface);
-
-  int ret = -1;
-  struct mgmt_pkt cmd;
-  struct pollfd pollfd;
-  struct sockaddr_hci hci_addr = {
-      .hci_family = AF_BLUETOOTH,
-      .hci_dev = HCI_DEV_NONE,
-      .hci_channel = HCI_CHANNEL_CONTROL,
-  };
-
-  // Open and bind a socket to the bluetooth control interface in the
-  // kernel driver, used to send control commands and receive control
-  // events.
-  int fd = socket(PF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
-  if (fd < 0) {
-    ALOGE("unable to open raw bluetooth socket: %s", strerror(errno));
-    return -1;
-  }
-
-  if (bind(fd, (struct sockaddr*)&hci_addr, sizeof(hci_addr)) < 0) {
-    ALOGE("unable to bind bluetooth control channel: %s", strerror(errno));
-    goto end;
-  }
-
-  // Send the control command [Read Index List].
-  cmd = {
-      .opcode = MGMT_OP_READ_INDEX_LIST,
-      .index = MGMT_INDEX_NONE,
-      .len = 0,
-  };
-
-  if (write(fd, &cmd, 6) != 6) {
-    ALOGE("error writing mgmt command: %s", strerror(errno));
-    goto end;
-  }
-
-  // Poll the control socket waiting for the command response,
-  // and subsequent [Index Added] events. The loops continue without
-  // timeout until the selected hci interface is detected.
-  pollfd = {.fd = fd, .events = POLLIN};
-
-  for (;;) {
-    ret = poll(&pollfd, 1, -1);
-
-    // Poll interrupted, try again.
-    if (ret == -1 && (errno == EINTR || errno == EAGAIN)) {
-      continue;
-    }
-
-    // Poll failure, abandon.
-    if (ret == -1) {
-      ALOGE("poll error: %s", strerror(errno));
-      break;
-    }
-
-    // Spurious wakeup, try again.
-    if (ret == 0 || (pollfd.revents & POLLIN) == 0) {
-      continue;
-    }
-
-    // Read the next control event.
-    struct mgmt_pkt ev {};
-    ret = read(fd, &ev, sizeof(ev));
-    if (ret < 0) {
-      ALOGE("error reading mgmt event: %s", strerror(errno));
-      goto end;
-    }
-
-    // Received [Read Index List] command response.
-    if (ev.opcode == MGMT_EV_CMD_COMPLETE) {
-      struct mgmt_ev_read_index_list* data =
-          (struct mgmt_ev_read_index_list*)ev.data;
-
-      // Prefer the exact hci_interface
-      for (int i = 0; i < data->num_controllers; i++) {
-        if (data->index[i] == hci_interface) {
-          ALOGI("hci interface %d found", data->index[i]);
-          ret = data->index[i];
-          goto end;
-        }
-      }
-
-      // Accept a larger one if we can't find the exact one
-      for (int i = 0; i < data->num_controllers; i++) {
-        if (data->index[i] >= hci_interface) {
-          ALOGI("hci interface %d found", data->index[i]);
-          ret = data->index[i];
-          goto end;
-        }
-      }
-    }
-
-    // Received [Index Added] event.
-    if (ev.opcode == MGMT_EV_INDEX_ADDED && ev.index == hci_interface) {
-      ALOGI("hci interface %d added", hci_interface);
-      ret = hci_interface;
-      goto end;
-    }
-  }
-
-end:
-  ::close(fd);
-  return ret;
-}
-
-int NetBluetoothMgmt::findRfKill() {
-    char rfkill_type[64];
-    char type[16];
-    int fd, size, i;
-    for(i = 0; rfkill_state_ == NULL; i++)
-    {
-        snprintf(rfkill_type, sizeof(rfkill_type), "/sys/class/rfkill/rfkill%d/type", i);
-        if ((fd = open(rfkill_type, O_RDONLY)) < 0)
-        {
-            ALOGE("open(%s) failed: %s (%d)\n", rfkill_type, strerror(errno), errno);
-            return -1;
-        }
-
-        size = read(fd, &type, sizeof(type));
-        ::close(fd);
-
-        if ((size >= 9) && !memcmp(type, "bluetooth", 9))
-        {
-            ::asprintf(&rfkill_state_, "/sys/class/rfkill/rfkill%d/state", i);
-            break;
-        }
-    }
-    return 0;
-}
-
-int NetBluetoothMgmt::rfKill(int block) {
-  int fd;
-  char on = (block)?'1':'0';
-  if (findRfKill() != 0) return 0;
-
-  fd = open(rfkill_state_, O_WRONLY);
-  if (fd < 0) {
-    ALOGE( "Unable to open /dev/rfkill");
-    return -1;
-  }
-  ssize_t len;
-  WRITE_NO_INTR(len = write(fd, &on, 1));
-  if (len < 0) {
-    ALOGE( "Failed to change rfkill state");
-    ::close(fd);
-    return -1;
-  }
-  ::close(fd);
-  return 0;
-}
-
-int NetBluetoothMgmt::openHci(int hci_interface) {
-  ALOGI("opening hci interface %d", hci_interface);
-
-  // Block Bluetooth.
-  rfkill_state_ = NULL;
-  rfKill(1);
-
-  // Wait for the HCI interface to complete initialization or to come online.
-  int hci = waitHciDev(hci_interface);
-  if (hci < 0) {
-    ALOGE("hci interface %d not found", hci_interface);
-    return -1;
-  }
-
-  // Open the raw HCI socket.
-  int fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
-  if (fd < 0) {
-    ALOGE("unable to open raw bluetooth socket: %s", strerror(errno));
-    return -1;
-  }
-
-  struct sockaddr_hci hci_addr = {
-      .hci_family = AF_BLUETOOTH,
-      .hci_dev = static_cast<uint16_t>(hci),
-      .hci_channel = HCI_CHANNEL_USER,
-  };
-
-  // Bind the socket to the selected interface.
-  if (bind(fd, (struct sockaddr*)&hci_addr, sizeof(hci_addr)) < 0) {
-    ALOGE("unable to bind bluetooth user channel: %s", strerror(errno));
-    ::close(fd);
-    return -1;
-  }
-
-  ALOGI("hci interface %d ready", hci);
-  bt_fd_ = fd;
-  return fd;
-}
-
-void NetBluetoothMgmt::closeHci() {
-  if (bt_fd_ != -1) {
-    ::close(bt_fd_);
-    bt_fd_ = -1;
-  }
-
-  // Unblock Bluetooth.
-  rfKill(0);
-  free(rfkill_state_);
-}
-
-}  // namespace aidl::android::hardware::bluetooth::impl

bluetooth/net_bluetooth_mgmt.h

@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2024 KonstaKANG
- *
- * 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.
- */
-
-#pragma once
-
-#include <unistd.h>
-
-namespace aidl::android::hardware::bluetooth::impl {
-
-class NetBluetoothMgmt {
- public:
-  NetBluetoothMgmt() {}
-  ~NetBluetoothMgmt() {
-    ::close(bt_fd_);
-  }
-
-  int openHci(int hci_interface = 0);
-  void closeHci();
-
- private:
-  int waitHciDev(int hci_interface);
-  int findRfKill();
-  int rfKill(int block);
-  char *rfkill_state_;
-
-  // File descriptor opened to the bluetooth user channel.
-  int bt_fd_{-1};
-};
-
-}  // namespace aidl::android::hardware::bluetooth::impl

boot/config.txt

@@ -12,11 +12,10 @@ disable_overscan=1
 
 # Display panel
 #dtoverlay=vc4-kms-dsi-7inch
-#dtoverlay=vc4-kms-dsi-ili9881-7inch
+#dtoverlay=rpi-backlight
 
 # Graphics acceleration
 dtoverlay=vc4-kms-v3d
-dtoverlay=cma,cma-320
 
 # I2C
 #dtparam=i2c_arm=on
@@ -29,6 +28,3 @@ dtoverlay=cma,cma-320
 
 # USB
 dtoverlay=dwc2,dr_mode=peripheral
-[cm5]
-dtoverlay=dwc2,dr_mode=otg
-[all]

camera/android.hardware.camera.provider@2.5-service_64.rpi.rc

@@ -0,0 +1,10 @@
+service vendor.camera-provider-2-5 /vendor/bin/hw/android.hardware.camera.provider@2.5-service_64
+    class hal
+    user cameraserver
+    group audio camera input drmrpc
+    ioprio rt 4
+    capabilities SYS_NICE
+    task_profiles CameraServiceCapacity MaxPerformance
+    override
+    setenv LIBCAMERA_LOG_LEVELS *:WARN
+    setenv LIBCAMERA_LOG_FILE syslog

camera/camera_hal.yaml

@@ -8,18 +8,9 @@ cameras:
   "/base/axi/pcie@120000/rp1/i2c@88000/imx477@1a":
     location: back
     rotation: 0
-  "/base/axi/pcie@120000/rp1/i2c@88000/imx500@1a":
-    location: back
-    rotation: 0
-  "/base/axi/pcie@120000/rp1/i2c@88000/imx519@1a":
-    location: back
-    rotation: 0
   "/base/axi/pcie@120000/rp1/i2c@88000/imx708@1a":
     location: back
     rotation: 0
   "/base/axi/pcie@120000/rp1/i2c@88000/ov5647@36":
     location: back
     rotation: 0
-  "/base/axi/pcie@120000/rp1/i2c@88000/ov64a40@36":
-    location: back
-    rotation: 0

camera/external_camera_config.xml

@@ -19,7 +19,11 @@
 <ExternalCamera>
     <Provider>
         <ignore> <!-- Internal video devices to be ignored by external camera HAL -->
-            <id>19</id> <!-- No leading/trailing spaces -->
+            <id>13</id> <!-- No leading/trailing spaces -->
+            <id>14</id>
+            <id>15</id>
+            <id>16</id>
+            <id>19</id>
             <id>20</id>
             <id>21</id>
             <id>22</id>
@@ -36,6 +40,8 @@
             <id>33</id>
             <id>34</id>
             <id>35</id>
+            <id>36</id>
+            <id>37</id>
         </ignore>
     </Provider>
     <!-- See ExternalCameraUtils.cpp for default values of Device configurations below -->

cec/Android.bp

@@ -0,0 +1,26 @@
+// Copyright (C) 2021 The Android Open Source Project
+// Copyright (C) 2025 KonstaKANG
+//
+// SPDX-License-Identifier: Apache-2.0
+
+cc_binary {
+    name: "android.hardware.tv.cec@1.0-service.rpi",
+    relative_install_path: "hw",
+    init_rc: ["android.hardware.tv.cec@1.0-service.rpi.rc"],
+    vintf_fragments: ["android.hardware.tv.cec@1.0-service.rpi.xml"],
+    vendor: true,
+    srcs: [
+        "HdmiCec.cpp",
+        "HdmiCecPort.cpp",
+        "service.cpp",
+    ],
+    shared_libs: [
+        "android.hardware.tv.cec@1.0",
+        "libbase",
+        "libcutils",
+        "libhardware",
+        "libhidlbase",
+        "liblog",
+        "libutils",
+    ],
+}

cec/HdmiCec.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.tv.hdmi.cec-service.rpi"
+#define LOG_TAG "android.hardware.tv.cec@1.0-service.rpi"
 
 #include <android-base/logging.h>
 #include <android-base/properties.h>
@@ -29,19 +29,20 @@
 
 #include "HdmiCec.h"
 
-#define PROPERTY_CEC_DEVICE "persist.vendor.hdmi.cec_device"
-
-using android::base::GetProperty;
-using ndk::ScopedAStatus;
-using std::string;
+#define PROPERTY_CEC_DEVICE "persist.hdmi.cec_device"
+#define PROPERTY_CEC_VERSION "ro.hdmi.cec_version"
+#define PROPERTY_VENDOR_ID "ro.hdmi.vendor_id"
 
 namespace android {
 namespace hardware {
 namespace tv {
-namespace hdmi {
 namespace cec {
+namespace V1_0 {
 namespace implementation {
 
+using android::base::GetProperty;
+using std::string;
+
 HdmiCec::HdmiCec() {
     mCecEnabled = false;
     mWakeupEnabled = false;
@@ -58,23 +59,22 @@ HdmiCec::~HdmiCec() {
     release();
 }
 
-ScopedAStatus HdmiCec::addLogicalAddress(CecLogicalAddress addr, Result* _aidl_return) {
+// Methods from ::android::hardware::tv::cec::V1_0::IHdmiCec follow.
+Return<Result> HdmiCec::addLogicalAddress(CecLogicalAddress addr) {
     if (addr < CecLogicalAddress::TV || addr >= CecLogicalAddress::BROADCAST) {
         LOG(ERROR) << "Add logical address failed, Invalid address";
-        *_aidl_return = Result::FAILURE_INVALID_ARGS;
-        return ScopedAStatus::ok();
+        return Result::FAILURE_INVALID_ARGS;
     }
 
     cec_log_addrs cecLogAddrs;
     int ret = ioctl(mHdmiCecPorts[0]->mCecFd, CEC_ADAP_G_LOG_ADDRS, &cecLogAddrs);
     if (ret) {
         LOG(ERROR) << "Add logical address failed, Error = " << strerror(errno);
-        *_aidl_return = Result::FAILURE_BUSY;
-        return ScopedAStatus::ok();
+        return Result::FAILURE_BUSY;
     }
 
-    cecLogAddrs.cec_version = CEC_OP_CEC_VERSION_1_4;
-    cecLogAddrs.vendor_id = 0x000c03;  // HDMI LLC vendor ID
+    cecLogAddrs.cec_version = getCecVersion();
+    cecLogAddrs.vendor_id = getVendorId();
 
     unsigned int logAddrType = CEC_LOG_ADDR_TYPE_UNREGISTERED;
     unsigned int allDevTypes = 0;
@@ -121,9 +121,6 @@ ScopedAStatus HdmiCec::addLogicalAddress(CecLogicalAddress addr, Result* _aidl_r
         case CecLogicalAddress::UNREGISTERED:
             cecLogAddrs.flags |= CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK;
             break;
-        case CecLogicalAddress::BACKUP_1:
-        case CecLogicalAddress::BACKUP_2:
-            break;
     }
 
     int logAddrIndex = cecLogAddrs.num_log_addrs;
@@ -139,15 +136,13 @@ ScopedAStatus HdmiCec::addLogicalAddress(CecLogicalAddress addr, Result* _aidl_r
     if (ret) {
         LOG(ERROR) << "Add logical address failed for port " << mHdmiCecPorts[0]->mPortId
                    << ", Error = " << strerror(errno);
-        *_aidl_return = Result::FAILURE_BUSY;
-        return ScopedAStatus::ok();
+        return Result::FAILURE_BUSY;
     }
 
-    *_aidl_return = Result::SUCCESS;
-    return ScopedAStatus::ok();
+    return Result::SUCCESS;
 }
 
-ScopedAStatus HdmiCec::clearLogicalAddress() {
+Return<void> HdmiCec::clearLogicalAddress() {
     cec_log_addrs cecLogAddrs;
     memset(&cecLogAddrs, 0, sizeof(cecLogAddrs));
 
@@ -157,41 +152,27 @@ ScopedAStatus HdmiCec::clearLogicalAddress() {
                    << ", Error = " << strerror(errno);
     }
 
-    return ScopedAStatus::ok();
+    return Void();
 }
 
-ScopedAStatus HdmiCec::enableAudioReturnChannel(int32_t portId __unused, bool enable __unused) {
-    return ScopedAStatus::ok();
-}
-
-ScopedAStatus HdmiCec::getCecVersion(int32_t* _aidl_return) {
-    *_aidl_return = CEC_OP_CEC_VERSION_1_4;
-    return ScopedAStatus::ok();
-}
-
-ScopedAStatus HdmiCec::getPhysicalAddress(int32_t* _aidl_return) {
+Return<void> HdmiCec::getPhysicalAddress(getPhysicalAddress_cb callback) {
     uint16_t addr;
 
     int ret = ioctl(mHdmiCecPorts[0]->mCecFd, CEC_ADAP_G_PHYS_ADDR, &addr);
     if (ret) {
         LOG(ERROR) << "Get physical address failed, Error = " << strerror(errno);
-        return ScopedAStatus::fromServiceSpecificError(
-                static_cast<int32_t>(Result::FAILURE_INVALID_STATE));
+        callback(Result::FAILURE_INVALID_STATE, addr);
+        return Void();
     }
 
-    *_aidl_return = addr;
-    return ScopedAStatus::ok();
+    callback(Result::SUCCESS, addr);
+
+    return Void();
 }
 
-ScopedAStatus HdmiCec::getVendorId(int32_t* _aidl_return) {
-    *_aidl_return = 0x000c03;  // HDMI LLC vendor ID
-    return ScopedAStatus::ok();
-}
-
-ScopedAStatus HdmiCec::sendMessage(const CecMessage& message, SendMessageResult* _aidl_return) {
+Return<SendMessageResult> HdmiCec::sendMessage(const CecMessage& message) {
     if (!mCecEnabled) {
-        *_aidl_return = SendMessageResult::FAIL;
-        return ScopedAStatus::ok();
+        return SendMessageResult::FAIL;
     }
 
     cec_msg cecMsg;
@@ -209,51 +190,104 @@ ScopedAStatus HdmiCec::sendMessage(const CecMessage& message, SendMessageResult*
     int ret = ioctl(mHdmiCecPorts[0]->mCecFd, CEC_TRANSMIT, &cecMsg);
     if (ret) {
         LOG(ERROR) << "Send message failed, Error = " << strerror(errno);
-        *_aidl_return = SendMessageResult::FAIL;
-        return ScopedAStatus::ok();
+        return SendMessageResult::FAIL;
     }
 
     if (cecMsg.tx_status != CEC_TX_STATUS_OK) {
         LOG(ERROR) << "Send message tx_status = " << cecMsg.tx_status;
     }
 
-    *_aidl_return = getSendMessageResult(cecMsg.tx_status);
-    return ScopedAStatus::ok();
+    return getSendMessageResult(cecMsg.tx_status);
 }
 
-ScopedAStatus HdmiCec::setCallback(const std::shared_ptr<IHdmiCecCallback>& callback) {
+Return<void> HdmiCec::setCallback(const sp<IHdmiCecCallback>& callback) {
     if (mCallback != nullptr) {
+        mCallback->unlinkToDeath(this);
         mCallback = nullptr;
     }
 
     if (callback != nullptr) {
         mCallback = callback;
+        mCallback->linkToDeath(this, 0 /*cookie*/);
     }
 
-    return ScopedAStatus::ok();
+    return Void();
 }
 
-ScopedAStatus HdmiCec::setLanguage(const std::string& language __unused) {
-    return ScopedAStatus::ok();
+Return<int32_t> HdmiCec::getCecVersion() {
+    return property_get_int32(PROPERTY_CEC_VERSION, CEC_OP_CEC_VERSION_1_4);
 }
 
-ScopedAStatus HdmiCec::enableWakeupByOtp(bool value) {
-    mWakeupEnabled = value;
-    return ScopedAStatus::ok();
+Return<uint32_t> HdmiCec::getVendorId() {
+    return property_get_int32(PROPERTY_VENDOR_ID, 0x000c03 /* HDMI LLC vendor ID */);
 }
 
-ScopedAStatus HdmiCec::enableCec(bool value) {
-    mCecEnabled = value;
-    return ScopedAStatus::ok();
+Return<void> HdmiCec::getPortInfo(getPortInfo_cb callback) {
+    uint16_t addr = CEC_PHYS_ADDR_INVALID;
+
+    int ret = ioctl(mHdmiCecPorts[0]->mCecFd, CEC_ADAP_G_PHYS_ADDR, &addr);
+    if (ret) {
+        LOG(ERROR) << "Get port info failed for port : " << mHdmiCecPorts[0]->mPortId
+                   << ", Error = " << strerror(errno);
+    }
+
+    hidl_vec<HdmiPortInfo> portInfos {
+        {.type = HdmiPortType::OUTPUT,
+         .portId = mHdmiCecPorts[0]->mPortId,
+         .cecSupported = true,
+         .arcSupported = false,
+         .physicalAddress = addr}
+    };
+    callback(portInfos);
+
+    return Void();
 }
 
-ScopedAStatus HdmiCec::enableSystemCecControl(bool value) {
-    mCecControlEnabled = value;
-    return ScopedAStatus::ok();
+Return<void> HdmiCec::setOption(OptionKey key, bool value) {
+    switch (key) {
+        case OptionKey::ENABLE_CEC:
+            LOG(DEBUG) << "setOption: Enable CEC: " << value;
+            mCecEnabled = value;
+            break;
+        case OptionKey::WAKEUP:
+            LOG(DEBUG) << "setOption: WAKEUP: " << value;
+            mWakeupEnabled = value;
+            break;
+        case OptionKey::SYSTEM_CEC_CONTROL:
+            LOG(DEBUG) << "setOption: SYSTEM_CEC_CONTROL: " << value;
+            mCecControlEnabled = value;
+            break;
+    }
+
+    return Void();
+}
+
+Return<void> HdmiCec::setLanguage(const hidl_string& language __unused) {
+    return Void();
+}
+
+Return<void> HdmiCec::enableAudioReturnChannel(int32_t portId __unused, bool enable __unused) {
+    return Void();
+}
+
+Return<bool> HdmiCec::isConnected(int32_t portId __unused) {
+    uint16_t addr = CEC_PHYS_ADDR_INVALID;
+
+    int ret = ioctl(mHdmiCecPorts[0]->mCecFd, CEC_ADAP_G_PHYS_ADDR, &addr);
+    if (ret) {
+        LOG(ERROR) << "Is connected failed, Error = " << strerror(errno);
+        return false;
+    }
+
+    if (addr == CEC_PHYS_ADDR_INVALID) {
+        return false;
+    }
+
+    return true;
 }
 
 // Initialise the cec file descriptor
-Result HdmiCec::init() {
+Return<Result> HdmiCec::init() {
     string cecDevice = GetProperty(PROPERTY_CEC_DEVICE, "cec0");
     if (cecDevice != "cec0" && cecDevice != "cec1") {
         LOG(ERROR) << "Invalid CEC device " << cecDevice;
@@ -281,7 +315,7 @@ Result HdmiCec::init() {
     return Result::SUCCESS;
 }
 
-void HdmiCec::release() {
+Return<void> HdmiCec::release() {
     mCecEnabled = false;
     mWakeupEnabled = false;
     mCecControlEnabled = false;
@@ -294,6 +328,8 @@ void HdmiCec::release() {
     setCallback(nullptr);
     mHdmiCecPorts.clear();
     mEventThreads.clear();
+
+    return Void();
 }
 
 void HdmiCec::event_thread(HdmiCecPort* hdmiCecPort) {
@@ -330,6 +366,17 @@ void HdmiCec::event_thread(HdmiCecPort* hdmiCecPort) {
             if (!mCecEnabled) {
                 continue;
             }
+
+            if (ev.event == CEC_EVENT_STATE_CHANGE) {
+                if (mCallback != nullptr) {
+                    HotplugEvent hotplugEvent{
+                            .connected = (ev.state_change.phys_addr != CEC_PHYS_ADDR_INVALID),
+                            .portId = hdmiCecPort->mPortId};
+                    mCallback->onHotplugEvent(hotplugEvent);
+                } else {
+                    LOG(ERROR) << "No event callback for hotplug";
+                }
+            }
         }
 
         if (ufds[0].revents == POLLIN) { /* CEC Driver */
@@ -361,7 +408,7 @@ void HdmiCec::event_thread(HdmiCecPort* hdmiCecPort) {
             }
 
             if (mCallback != nullptr) {
-                size_t length = std::min(msg.len - 1, (uint32_t)(CEC_MESSAGE_BODY_MAX_LENGTH - 1));
+                size_t length = std::min(msg.len - 1, (uint32_t)MaxLength::MESSAGE_BODY);
                 CecMessage cecMessage{
                         .initiator = static_cast<CecLogicalAddress>(msg.msg[0] >> 4),
                         .destination = static_cast<CecLogicalAddress>(msg.msg[0] & 0xf),
@@ -436,7 +483,7 @@ bool HdmiCec::isPowerUICommand(cec_msg message) {
     }
 }
 
-SendMessageResult HdmiCec::getSendMessageResult(int tx_status) {
+Return<SendMessageResult> HdmiCec::getSendMessageResult(int tx_status) {
     switch (tx_status) {
         case CEC_TX_STATUS_OK:
             return SendMessageResult::SUCCESS;
@@ -450,8 +497,8 @@ SendMessageResult HdmiCec::getSendMessageResult(int tx_status) {
 }
 
 }  // namespace implementation
+}  // namespace V1_0
 }  // namespace cec
-}  // namespace hdmi
 }  // namespace tv
 }  // namespace hardware
 }  // namespace android

cec/HdmiCec.h

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#include <aidl/android/hardware/tv/hdmi/cec/BnHdmiCec.h>
 #include <hardware/hdmi_cec.h>
 #include <linux/cec.h>
 #include <thread>
@@ -25,42 +24,38 @@
 namespace android {
 namespace hardware {
 namespace tv {
-namespace hdmi {
 namespace cec {
+namespace V1_0 {
 namespace implementation {
 
 using std::shared_ptr;
 using std::thread;
 using std::vector;
 
-using ::aidl::android::hardware::tv::hdmi::cec::BnHdmiCec;
-using ::aidl::android::hardware::tv::hdmi::cec::CecLogicalAddress;
-using ::aidl::android::hardware::tv::hdmi::cec::CecMessage;
-using ::aidl::android::hardware::tv::hdmi::cec::IHdmiCec;
-using ::aidl::android::hardware::tv::hdmi::cec::IHdmiCecCallback;
-using ::aidl::android::hardware::tv::hdmi::cec::Result;
-using ::aidl::android::hardware::tv::hdmi::cec::SendMessageResult;
-
-struct HdmiCec : public BnHdmiCec {
+class HdmiCec : public IHdmiCec, public hidl_death_recipient {
   public:
     HdmiCec();
     ~HdmiCec();
-    ::ndk::ScopedAStatus addLogicalAddress(CecLogicalAddress addr, Result* _aidl_return) override;
-    ::ndk::ScopedAStatus clearLogicalAddress() override;
-    ::ndk::ScopedAStatus enableAudioReturnChannel(int32_t portId, bool enable) override;
-    ::ndk::ScopedAStatus getCecVersion(int32_t* _aidl_return) override;
-    ::ndk::ScopedAStatus getPhysicalAddress(int32_t* _aidl_return) override;
-    ::ndk::ScopedAStatus getVendorId(int32_t* _aidl_return) override;
-    ::ndk::ScopedAStatus sendMessage(const CecMessage& message,
-                                     SendMessageResult* _aidl_return) override;
-    ::ndk::ScopedAStatus setCallback(const std::shared_ptr<IHdmiCecCallback>& callback) override;
-    ::ndk::ScopedAStatus setLanguage(const std::string& language) override;
-    ::ndk::ScopedAStatus enableWakeupByOtp(bool value) override;
-    ::ndk::ScopedAStatus enableCec(bool value) override;
-    ::ndk::ScopedAStatus enableSystemCecControl(bool value) override;
+    // Methods from ::android::hardware::tv::cec::V1_0::IHdmiCec follow.
+    Return<Result> addLogicalAddress(CecLogicalAddress addr) override;
+    Return<void> clearLogicalAddress() override;
+    Return<void> getPhysicalAddress(getPhysicalAddress_cb _hidl_cb) override;
+    Return<SendMessageResult> sendMessage(const CecMessage& message) override;
+    Return<void> setCallback(const sp<IHdmiCecCallback>& callback) override;
+    Return<int32_t> getCecVersion() override;
+    Return<uint32_t> getVendorId() override;
+    Return<void> getPortInfo(getPortInfo_cb _hidl_cb) override;
+    Return<void> setOption(OptionKey key, bool value) override;
+    Return<void> setLanguage(const hidl_string& language) override;
+    Return<void> enableAudioReturnChannel(int32_t portId, bool enable) override;
+    Return<bool> isConnected(int32_t portId) override;
 
-    Result init();
-    void release();
+    virtual void serviceDied(uint64_t, const wp<::android::hidl::base::V1_0::IBase>&) {
+        setCallback(nullptr);
+    }
+
+    Return<Result> init();
+    Return<void> release();
 
   private:
     void event_thread(HdmiCecPort* hdmiCecPort);
@@ -69,7 +64,7 @@ struct HdmiCec : public BnHdmiCec {
     static bool isWakeupMessage(cec_msg message);
     static bool isTransferableInSleep(cec_msg message);
     static bool isPowerUICommand(cec_msg message);
-    static SendMessageResult getSendMessageResult(int tx_status);
+    static Return<SendMessageResult> getSendMessageResult(int tx_status);
 
     vector<thread> mEventThreads;
     vector<shared_ptr<HdmiCecPort>> mHdmiCecPorts;
@@ -89,12 +84,12 @@ struct HdmiCec : public BnHdmiCec {
      */
     bool mCecControlEnabled;
 
-    std::shared_ptr<IHdmiCecCallback> mCallback;
+    sp<IHdmiCecCallback> mCallback;
 };
 
 }  // namespace implementation
+}  // namespace V1_0
 }  // namespace cec
-}  // namespace hdmi
 }  // namespace tv
 }  // namespace hardware
 }  // namespace android

cec/HdmiCecPort.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.tv.hdmi.cec-service.rpi"
+#define LOG_TAG "android.hardware.tv.cec@1.0-service.rpi"
 
 #include <android-base/logging.h>
 #include <errno.h>
@@ -29,8 +29,8 @@
 namespace android {
 namespace hardware {
 namespace tv {
-namespace hdmi {
 namespace cec {
+namespace V1_0 {
 namespace implementation {
 
 HdmiCecPort::HdmiCecPort(unsigned int portId) {
@@ -44,7 +44,7 @@ HdmiCecPort::~HdmiCecPort() {
 }
 
 // Initialise the cec file descriptor
-Result HdmiCecPort::init(const char* path) {
+Return<Result> HdmiCecPort::init(const char* path) {
     mCecFd = open(path, O_RDWR);
     if (mCecFd < 0) {
         LOG(ERROR) << "Failed to open " << path << ", Error = " << strerror(errno);
@@ -82,7 +82,7 @@ Result HdmiCecPort::init(const char* path) {
     return Result::SUCCESS;
 }
 
-void HdmiCecPort::release() {
+Return<void> HdmiCecPort::release() {
     if (mExitFd > 0) {
         uint64_t tmp = 1;
         write(mExitFd, &tmp, sizeof(tmp));
@@ -93,11 +93,12 @@ void HdmiCecPort::release() {
     if (mCecFd > 0) {
         close(mCecFd);
     }
+    return Void();
 }
 
 }  // namespace implementation
+}  // namespace V1_0
 }  // namespace cec
-}  // namespace hdmi
 }  // namespace tv
 }  // namespace hardware
 }  // namespace android

cec/HdmiCecPort.h

@@ -15,23 +15,21 @@
  * limitations under the License.
  */
 
-#include <aidl/android/hardware/tv/hdmi/cec/BnHdmiCec.h>
+#include <android/hardware/tv/cec/1.0/IHdmiCec.h>
 
 namespace android {
 namespace hardware {
 namespace tv {
-namespace hdmi {
 namespace cec {
+namespace V1_0 {
 namespace implementation {
 
-using ::aidl::android::hardware::tv::hdmi::cec::Result;
-
 class HdmiCecPort {
   public:
     HdmiCecPort(unsigned int portId);
     ~HdmiCecPort();
-    Result init(const char* path);
-    void release();
+    Return<Result> init(const char* path);
+    Return<void> release();
 
     unsigned int mPortId;
     int mCecFd;
@@ -39,8 +37,8 @@ class HdmiCecPort {
 };
 
 }  // namespace implementation
+}  // namespace V1_0
 }  // namespace cec
-}  // namespace hdmi
 }  // namespace tv
 }  // namespace hardware
 }  // namespace android

cec/android.hardware.tv.cec@1.0-service.rpi.rc

@@ -0,0 +1,5 @@
+service vendor.cec-hal-1-0-rpi /vendor/bin/hw/android.hardware.tv.cec@1.0-service.rpi
+    interface android.hardware.tv.cec@1.0::IHdmiCec default
+    class hal
+    user system
+    group system

cec/android.hardware.tv.cec@1.0-service.rpi.xml

@@ -1,7 +1,8 @@
 <manifest version="1.0" type="device">
-    <hal format="aidl">
-        <name>android.hardware.tv.hdmi.cec</name>
-        <version>1</version>
+    <hal format="hidl">
+        <name>android.hardware.tv.cec</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
         <interface>
             <name>IHdmiCec</name>
             <instance>default</instance>

cec/service.cpp

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ * Copyright (C) 2025 KonstaKANG
+ *
+ * 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.
+ */
+
+#define LOG_TAG "android.hardware.tv.cec@1.0-service-rpi"
+
+#include <android/hardware/tv/cec/1.0/IHdmiCec.h>
+#include <hidl/LegacySupport.h>
+#include "HdmiCec.h"
+
+using android::hardware::configureRpcThreadpool;
+using android::hardware::joinRpcThreadpool;
+using android::hardware::tv::cec::V1_0::IHdmiCec;
+using android::hardware::tv::cec::V1_0::implementation::HdmiCec;
+
+using android::OK;
+using android::status_t;
+
+int main() {
+    configureRpcThreadpool(1, true /* callerWillJoin */);
+
+    android::sp<IHdmiCec> service = new HdmiCec();
+
+    status_t status = service->registerAsService();
+    if (status != OK) {
+        ALOGE("Cannot register HDMI-CEC HAL service.");
+        return 1;
+    }
+
+    ALOGI("HDMI-CEC HAL ready.");
+    joinRpcThreadpool();
+
+    // Under normal cases, execution will not reach this line.
+    ALOGE("HDMI-CEC HAL failed to join thread pool.");
+    return 1;
+}

compatibility_matrix.xml

@@ -0,0 +1,34 @@
+<compatibility-matrix version="1.0" type="device">
+    <hal format="hidl" optional="false">
+        <name>android.frameworks.sensorservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>ISensorManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.manager</name>
+        <version>1.2</version>
+        <interface>
+            <name>IServiceManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>android.hidl.memory</name>
+        <version>1.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>ashmem</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.token</name>
+        <version>1.0</version>
+        <interface>
+            <name>ITokenManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>

device.mk

@@ -5,8 +5,9 @@
 #
 
 DEVICE_PATH := device/brcm/rpi5
+PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH)
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
 $(call inherit-product, vendor/brcm/rpi5/rpi5-vendor.mk)
 
@@ -14,7 +15,7 @@ $(call inherit-product, vendor/brcm/rpi5/rpi5-vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 
 # API level
-PRODUCT_SHIPPING_API_LEVEL := 35
+PRODUCT_SHIPPING_API_LEVEL := 34
 
 # Audio
 PRODUCT_PACKAGES += \
@@ -26,6 +27,13 @@ PRODUCT_PACKAGES += \
     audio.r_submix.default \
     audio.usb.default
 
+PRODUCT_PACKAGES += \
+    tinycap \
+    tinyhostless \
+    tinymix \
+    tinypcminfo \
+    tinyplay
+
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
@@ -34,9 +42,39 @@ PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
 
+PRODUCT_PACKAGES += \
+    alsa_amixer \
+    alsa_aplay \
+    alsa_arecord \
+    alsa_loop
+
+PRODUCT_COPY_FILES += \
+    external/alsa-lib/src/conf/alsa.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/alsa.conf \
+    external/alsa-lib/src/conf/cards/aliases.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/cards/aliases.conf \
+    external/alsa-lib/src/conf/cards/vc4-hdmi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/cards/vc4-hdmi.conf \
+    external/alsa-lib/src/conf/ctl/default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/ctl/default.conf \
+    external/alsa-lib/src/conf/pcm/center_lfe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/center_lfe.conf \
+    external/alsa-lib/src/conf/pcm/default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/default.conf \
+    external/alsa-lib/src/conf/pcm/dmix.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/dmix.conf \
+    external/alsa-lib/src/conf/pcm/dpl.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/dpl.conf \
+    external/alsa-lib/src/conf/pcm/dsnoop.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/dsnoop.conf \
+    external/alsa-lib/src/conf/pcm/front.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/front.conf \
+    external/alsa-lib/src/conf/pcm/hdmi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/hdmi.conf \
+    external/alsa-lib/src/conf/pcm/iec958.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/iec958.conf \
+    external/alsa-lib/src/conf/pcm/modem.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/modem.conf \
+    external/alsa-lib/src/conf/pcm/rear.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/rear.conf \
+    external/alsa-lib/src/conf/pcm/side.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/side.conf \
+    external/alsa-lib/src/conf/pcm/surround21.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/surround21.conf \
+    external/alsa-lib/src/conf/pcm/surround40.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/surround40.conf \
+    external/alsa-lib/src/conf/pcm/surround41.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/surround41.conf \
+    external/alsa-lib/src/conf/pcm/surround50.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/surround50.conf \
+    external/alsa-lib/src/conf/pcm/surround51.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/surround51.conf \
+    external/alsa-lib/src/conf/pcm/surround71.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/surround71.conf \
+    external/alsa-lib/src/conf/smixer.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/smixer.conf
+
 # Bluetooth
 PRODUCT_PACKAGES += \
-    com.android.hardware.bluetooth.rpi5
+    android.hardware.bluetooth@1.1-service.btlinux
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
@@ -61,12 +99,28 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.camera.external.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.external.xml
 
 PRODUCT_PACKAGES += \
-    android.hardware.camera.provider-V1-libcamera-service \
+    android.hardware.camera.provider@2.5-service_64 \
     camera.libcamera \
     ipa_rpi_pisp
 
 PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/camera/camera_hal.yaml:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/camera_hal.yaml
+    $(DEVICE_PATH)/camera/android.hardware.camera.provider@2.5-service_64.rpi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.camera.provider@2.5-service_64.rpi.rc
+
+PRODUCT_COPY_FILES += \
+    $(DEVICE_PATH)/camera/camera_hal.yaml:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/camera_hal.yaml \
+    external/libcamera/src/ipa/rpi/pisp/data/imx219.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx219.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx219_noir.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx219_noir.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx296.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx296.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx296_mono.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx296_mono.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx477.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx477.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx477_noir.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx477_noir.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx477_scientific.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx477_scientific.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx708.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx708.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx708_noir.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx708_noir.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx708_wide.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx708_wide.json \
+    external/libcamera/src/ipa/rpi/pisp/data/imx708_wide_noir.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/imx708_wide_noir.json \
+    external/libcamera/src/ipa/rpi/pisp/data/ov5647.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/ov5647.json \
+    external/libcamera/src/ipa/rpi/pisp/data/ov5647_noir.json:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/ipa/rpi/pisp/ov5647_noir.json
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml \
@@ -81,8 +135,7 @@ PRODUCT_COPY_FILES += \
 
 # CEC
 PRODUCT_PACKAGES += \
-    com.android.hardware.tv.hdmi.cec.rpi5 \
-    com.android.hardware.tv.hdmi.connection.rpi5
+    android.hardware.tv.cec@1.0-service.rpi
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.hdmi.cec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hdmi.cec.xml
@@ -92,7 +145,7 @@ PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
 
 # DRM
 PRODUCT_PACKAGES += \
-    com.android.hardware.drm.clearkey
+    android.hardware.drm-service.clearkey
 
 # Emergency info
 PRODUCT_PACKAGES += \
@@ -104,23 +157,21 @@ PRODUCT_COPY_FILES += \
 
 # FFmpeg
 PRODUCT_PACKAGES += \
-    com.android.hardware.media.c2.ffmpeg
-
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/media/media_codecs_ffmpeg_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_ffmpeg_c2.xml \
-    $(DEVICE_PATH)/seccomp_policy/android.hardware.media.c2-ffmpeg.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/android.hardware.media.c2-ffmpeg.policy
+    android.hardware.media.c2@1.2-service-ffmpeg
 
 # Gatekeeper
 PRODUCT_PACKAGES += \
-    com.android.hardware.gatekeeper.nonsecure
+    android.hardware.gatekeeper@1.0-service.software
 
 # Graphics
 PRODUCT_PACKAGES += \
-    android.hardware.graphics.allocator-service.minigbm_gbm_mesa \
-    mapper.minigbm_gbm_mesa
+    android.hardware.graphics.allocator@4.0-service.minigbm_gbm_mesa \
+    android.hardware.graphics.mapper@4.0-impl.minigbm_gbm_mesa \
+    libgbm_mesa_wrapper
 
 PRODUCT_PACKAGES += \
-    com.android.hardware.graphics.composer.drm_hwcomposer
+    android.hardware.graphics.composer@2.4-service \
+    hwcomposer.drm
 
 PRODUCT_PACKAGES += \
     libEGL_mesa \
@@ -133,7 +184,7 @@ PRODUCT_PACKAGES += \
     libgbm_mesa
 
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.software.opengles.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
+    frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
 
 PRODUCT_PACKAGES += \
     vulkan.broadcom
@@ -141,31 +192,27 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.level-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
     frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
-    frameworks/native/data/etc/android.software.vulkan.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml
+    frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml
 
 # Health
 PRODUCT_PACKAGES += \
-    com.android.hardware.health.rpi5
-
-# HIDL
-PRODUCT_PACKAGES += \
-    android.hidl.allocator@1.0-service \
-    hwservicemanager
+    android.hardware.health-service.rpi
 
 # Kernel
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)-kernel/Image:$(PRODUCT_OUT)/kernel
 
-# Keymint
-PRODUCT_PACKAGES += \
-    com.android.hardware.keymint.rust_nonsecure
-
+# Keylayout
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.keystore.app_attest_key.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.keystore.app_attest_key.xml
+    $(DEVICE_PATH)/keylayout/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl
+
+# Keymaster
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@4.1-service
 
 # Lights
 PRODUCT_PACKAGES += \
-    com.android.hardware.light.rpi5
+    android.hardware.light-service.rpi
 
 # Media
 PRODUCT_COPY_FILES += \
@@ -176,7 +223,7 @@ PRODUCT_COPY_FILES += \
 
 # Power
 PRODUCT_PACKAGES += \
-    com.android.hardware.power
+    android.hardware.power-service.example
 
 # Ramdisk
 PRODUCT_COPY_FILES += \
@@ -191,15 +238,12 @@ PRODUCT_COPY_FILES += \
     $(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
 
-# Soong
-PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH)
-
 # Storage
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 
 # Suspend
 PRODUCT_PACKAGES += \
-    com.android.hardware.suspend_blocker.rpi5
+    suspend_blocker_rpi
 
 # Thermal
 PRODUCT_PACKAGES += \
@@ -211,8 +255,8 @@ PRODUCT_COPY_FILES += \
 
 # USB
 PRODUCT_PACKAGES += \
-    com.android.hardware.usb \
-    com.android.hardware.usb.gadget.rpi5
+    android.hardware.usb-service.example \
+    android.hardware.usb.gadget-service.rpi
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \
@@ -224,11 +268,17 @@ $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk
 
 # Wifi
 PRODUCT_PACKAGES += \
-    com.android.hardware.wifi \
-    com.android.hardware.wifi.hostapd.rpi5 \
-    com.android.hardware.wifi.supplicant.rpi5 \
+    android.hardware.wifi-service \
+    hostapd \
+    hostapd_cli \
     libwpa_client \
-    wificond
+    wificond \
+    wpa_cli \
+    wpa_supplicant \
+    wpa_supplicant.conf
+
+PRODUCT_COPY_FILES += \
+    hardware/broadcom/wlan/bcmdhd/config/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml

framework_compatibility_matrix.xml

@@ -1 +1,11 @@
-<compatibility-matrix version="1.0" type="framework" />
+<compatibility-matrix version="1.0" type="framework">
+    <hal format="hidl" optional="true">
+        <name>android.hardware.media.c2</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>IComponentStore</name>
+            <instance>ffmpeg</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>

hdmi/cec/Android.bp

@@ -1,53 +0,0 @@
-// Copyright (C) 2021 The Android Open Source Project
-// Copyright (C) 2025 KonstaKANG
-//
-// SPDX-License-Identifier: Apache-2.0
-
-cc_binary {
-    name: "android.hardware.tv.hdmi.cec-service.rpi",
-    relative_install_path: "hw",
-    vendor: true,
-    srcs: [
-        "HdmiCec.cpp",
-        "HdmiCecPort.cpp",
-        "main.cpp",
-    ],
-    shared_libs: [
-        "android.hardware.tv.hdmi.cec-V1-ndk",
-        "libbase",
-        "libbinder_ndk",
-        "libcutils",
-        "libhardware",
-        "liblog",
-    ],
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.tv.hdmi.cec-service.rpi.rc",
-    src: "android.hardware.tv.hdmi.cec-service.rpi.rc",
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.tv.hdmi.cec-service.rpi.xml",
-    src: "android.hardware.tv.hdmi.cec-service.rpi.xml",
-    sub_dir: "vintf",
-    installable: false,
-}
-
-apex {
-    name: "com.android.hardware.tv.hdmi.cec.rpi5",
-    manifest: "apex_manifest.json",
-    file_contexts: "apex_file_contexts",
-    key: "com.android.hardware.key",
-    certificate: ":com.android.hardware.certificate",
-    updatable: false,
-    vendor: true,
-
-    binaries: ["android.hardware.tv.hdmi.cec-service.rpi"],
-    prebuilts: [
-        "android.hardware.tv.hdmi.cec-service.rpi.rc",
-        "android.hardware.tv.hdmi.cec-service.rpi.xml",
-    ],
-}

hdmi/cec/android.hardware.tv.hdmi.cec-service.rpi.rc

@@ -1,5 +0,0 @@
-service vendor.cec-rpi /apex/com.android.hardware.tv.hdmi.cec.rpi5/bin/hw/android.hardware.tv.hdmi.cec-service.rpi
-    interface aidl android.hardware.tv.hdmi.cec.IHdmiCec/default
-    class hal
-    user system
-    group system

hdmi/cec/apex_file_contexts

@@ -1,3 +0,0 @@
-(/.*)?                                                 u:object_r:vendor_file:s0
-/etc(/.*)?                                             u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.tv\.hdmi\.cec-service\.rpi  u:object_r:hal_tv_hdmi_cec_default_exec:s0

hdmi/cec/apex_manifest.json

@@ -1,4 +0,0 @@
-{
-    "name": "com.android.hardware.tv.hdmi.cec.rpi5",
-    "version": 1
-}

hdmi/cec/main.cpp

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2025 KonstaKANG
- *
- * 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.
- */
-
-#include "HdmiCec.h"
-
-#include <android-base/logging.h>
-#include <android/binder_manager.h>
-#include <android/binder_process.h>
-
-using android::hardware::tv::hdmi::cec::implementation::HdmiCec;
-
-int main() {
-    ABinderProcess_setThreadPoolMaxThreadCount(1);
-    ABinderProcess_startThreadPool();
-
-    std::shared_ptr<HdmiCec> hdmiCecAidl = ndk::SharedRefBase::make<HdmiCec>();
-    const std::string instance = std::string() + HdmiCec::descriptor + "/default";
-    binder_status_t status = AServiceManager_addService(hdmiCecAidl->asBinder().get(), instance.c_str());
-    CHECK_EQ(status, STATUS_OK);
-
-    ABinderProcess_joinThreadPool();
-    return EXIT_FAILURE;  // should not reach
-}

hdmi/connection/Android.bp

@@ -1,50 +0,0 @@
-// Copyright (C) 2022 The Android Open Source Project
-// Copyright (C) 2025 KonstaKANG
-//
-// SPDX-License-Identifier: Apache-2.0
-
-cc_binary {
-    name: "android.hardware.tv.hdmi.connection-service.rpi",
-    relative_install_path: "hw",
-    vendor: true,
-    srcs: [
-        "HdmiConnection.cpp",
-        "main.cpp",
-    ],
-    shared_libs: [
-        "android.hardware.tv.hdmi.connection-V1-ndk",
-        "libbase",
-        "libbinder_ndk",
-        "liblog",
-    ],
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.tv.hdmi.connection-service.rpi.rc",
-    src: "android.hardware.tv.hdmi.connection-service.rpi.rc",
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.tv.hdmi.connection-service.rpi.xml",
-    src: "android.hardware.tv.hdmi.connection-service.rpi.xml",
-    sub_dir: "vintf",
-    installable: false,
-}
-
-apex {
-    name: "com.android.hardware.tv.hdmi.connection.rpi5",
-    manifest: "apex_manifest.json",
-    file_contexts: "apex_file_contexts",
-    key: "com.android.hardware.key",
-    certificate: ":com.android.hardware.certificate",
-    updatable: false,
-    vendor: true,
-
-    binaries: ["android.hardware.tv.hdmi.connection-service.rpi"],
-    prebuilts: [
-        "android.hardware.tv.hdmi.connection-service.rpi.rc",
-        "android.hardware.tv.hdmi.connection-service.rpi.xml",
-    ],
-}

hdmi/connection/HdmiConnection.cpp

@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2025 KonstaKANG
- *
- * 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.
- */
-
-#define LOG_TAG "android.hardware.tv.hdmi.connection-service.rpi"
-
-#include "HdmiConnection.h"
-
-#include <android-base/file.h>
-#include <android-base/logging.h>
-
-using android::base::ReadFileToString;
-using ndk::ScopedAStatus;
-using std::string;
-
-namespace android {
-namespace hardware {
-namespace tv {
-namespace hdmi {
-namespace connection {
-namespace implementation {
-
-static const string drmCard = "card1";
-
-HdmiConnection::HdmiConnection() {
-    mCallback = nullptr;
-
-    for (int i = 0; i < 2; i++) {
-        mPortInfos.push_back(
-                {.type = HdmiPortType::OUTPUT,
-                 .portId = i,
-                 .cecSupported = true,
-                 .arcSupported = false,
-                 .eArcSupported = false,
-                 .physicalAddress = 0xFFFF});
-        mHpdSignal.push_back(HpdSignal::HDMI_HPD_PHYSICAL);
-    }
-}
-
-HdmiConnection::~HdmiConnection() {
-    if (mCallback != nullptr) {
-        mCallback = nullptr;
-    }
-}
-
-ScopedAStatus HdmiConnection::getPortInfo(std::vector<HdmiPortInfo>* _aidl_return) {
-    *_aidl_return = mPortInfos;
-    return ScopedAStatus::ok();
-}
-
-ScopedAStatus HdmiConnection::isConnected(int32_t portId, bool* _aidl_return) {
-    if (portId != 0 && portId != 1) {
-        *_aidl_return = false;
-        return ScopedAStatus::ok();
-    }
-
-    bool connected = false;
-    string hdmiStatusPath = "/sys/class/drm/" + drmCard + "-HDMI-A-" + to_string(portId + 1) + "/status";
-    if (!access(hdmiStatusPath.c_str(), R_OK)) {
-        string connectedValue;
-        if (ReadFileToString(hdmiStatusPath, &connectedValue)) {
-            connected = !connectedValue.compare("connected\n");
-        }
-    }
-    LOG(INFO) << "portId: " << portId << ", connected: " << connected;
-
-    *_aidl_return = connected;
-    return ScopedAStatus::ok();
-}
-
-ScopedAStatus HdmiConnection::setCallback(const std::shared_ptr<IHdmiConnectionCallback>& callback) {
-    if (mCallback != nullptr) {
-        mCallback = nullptr;
-    }
-
-    if (callback != nullptr) {
-        mCallback = callback;
-    }
-
-    return ScopedAStatus::ok();
-}
-
-ScopedAStatus HdmiConnection::setHpdSignal(HpdSignal signal, int32_t portId) {
-    if (portId != 0 && portId != 1) {
-        return ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
-    }
-
-    mHpdSignal.at(portId) = signal;
-    return ScopedAStatus::ok();
-}
-
-ScopedAStatus HdmiConnection::getHpdSignal(int32_t portId, HpdSignal* _aidl_return) {
-    if (portId != 0 && portId != 1) {
-        return ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
-    }
-
-    *_aidl_return = mHpdSignal.at(portId);
-    return ScopedAStatus::ok();
-}
-
-}  // namespace implementation
-}  // namespace connection
-}  // namespace hdmi
-}  // namespace tv
-}  // namespace hardware
-}  // namespace android

hdmi/connection/HdmiConnection.h

@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2025 KonstaKANG
- *
- * 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.
- */
-
-#include <aidl/android/hardware/tv/hdmi/connection/BnHdmiConnection.h>
-#include <aidl/android/hardware/tv/hdmi/connection/Result.h>
-#include <algorithm>
-#include <vector>
-
-using namespace std;
-
-namespace android {
-namespace hardware {
-namespace tv {
-namespace hdmi {
-namespace connection {
-namespace implementation {
-
-using ::aidl::android::hardware::tv::hdmi::connection::BnHdmiConnection;
-using ::aidl::android::hardware::tv::hdmi::connection::HdmiPortInfo;
-using ::aidl::android::hardware::tv::hdmi::connection::HdmiPortType;
-using ::aidl::android::hardware::tv::hdmi::connection::HpdSignal;
-using ::aidl::android::hardware::tv::hdmi::connection::IHdmiConnection;
-using ::aidl::android::hardware::tv::hdmi::connection::IHdmiConnectionCallback;
-using ::aidl::android::hardware::tv::hdmi::connection::Result;
-
-struct HdmiConnection : public BnHdmiConnection {
-    HdmiConnection();
-    ~HdmiConnection();
-    ::ndk::ScopedAStatus getPortInfo(std::vector<HdmiPortInfo>* _aidl_return) override;
-    ::ndk::ScopedAStatus isConnected(int32_t portId, bool* _aidl_return) override;
-    ::ndk::ScopedAStatus setCallback(
-            const std::shared_ptr<IHdmiConnectionCallback>& callback) override;
-    ::ndk::ScopedAStatus setHpdSignal(HpdSignal signal, int32_t portId) override;
-    ::ndk::ScopedAStatus getHpdSignal(int32_t portId, HpdSignal* _aidl_return) override;
-
-  private:
-    std::vector<HdmiPortInfo> mPortInfos;
-    std::vector<HpdSignal> mHpdSignal;
-
-    std::shared_ptr<IHdmiConnectionCallback> mCallback;
-};
-
-}  // namespace implementation
-}  // namespace connection
-}  // namespace hdmi
-}  // Namespace tv
-}  // namespace hardware
-}  // namespace android

hdmi/connection/android.hardware.tv.hdmi.connection-service.rpi.rc

@@ -1,5 +0,0 @@
-service vendor.hdmi-rpi /apex/com.android.hardware.tv.hdmi.connection.rpi5/bin/hw/android.hardware.tv.hdmi.connection-service.rpi
-    interface aidl android.hardware.tv.hdmi.connection.IHdmiConnection/default
-    class hal
-    user system
-    group system

hdmi/connection/android.hardware.tv.hdmi.connection-service.rpi.xml

@@ -1,10 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="aidl">
-        <name>android.hardware.tv.hdmi.connection</name>
-        <version>1</version>
-        <interface>
-            <name>IHdmiConnection</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>

hdmi/connection/apex_file_contexts

@@ -1,3 +0,0 @@
-(/.*)?                                                        u:object_r:vendor_file:s0
-/etc(/.*)?                                                    u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.tv\.hdmi\.connection-service\.rpi  u:object_r:hal_tv_hdmi_connection_default_exec:s0

hdmi/connection/apex_manifest.json

@@ -1,4 +0,0 @@
-{
-    "name": "com.android.hardware.tv.hdmi.connection.rpi5",
-    "version": 1
-}

hdmi/connection/main.cpp

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2025 KonstaKANG
- *
- * 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.
- */
-
-#include "HdmiConnection.h"
-
-#include <android-base/logging.h>
-#include <android/binder_manager.h>
-#include <android/binder_process.h>
-
-using android::hardware::tv::hdmi::connection::implementation::HdmiConnection;
-
-int main() {
-    ABinderProcess_setThreadPoolMaxThreadCount(1);
-    ABinderProcess_startThreadPool();
-
-    std::shared_ptr<HdmiConnection> hdmiAidl = ndk::SharedRefBase::make<HdmiConnection>();
-    const std::string instance = std::string() + HdmiConnection::descriptor + "/default";
-    binder_status_t status = AServiceManager_addService(hdmiAidl->asBinder().get(), instance.c_str());
-    CHECK_EQ(status, STATUS_OK);
-
-    ABinderProcess_joinThreadPool();
-    return EXIT_FAILURE;  // should not reach
-}

health/Android.bp

@@ -7,52 +7,26 @@ cc_binary {
     name: "android.hardware.health-service.rpi",
     relative_install_path: "hw",
     vendor: true,
+    init_rc: ["android.hardware.health-service.rpi.rc"],
+    vintf_fragments: ["android.hardware.health-service.rpi.xml"],
     srcs: [
         "HealthImpl.cpp",
         "main.cpp",
     ],
     static_libs: [
+        "android.hardware.health-translate-ndk",
         "libbatterymonitor",
-        "libhealth_aidl_impl",
         "libhealthloop",
+        "libhealth_aidl_impl",
     ],
     shared_libs: [
-        "android.hardware.health-V4-ndk",
         "libbase",
         "libbinder_ndk",
         "libcutils",
+        "libhidlbase",
         "liblog",
         "libutils",
+        "android.hardware.health-V3-ndk",
     ],
     overrides: ["charger"],
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.health-service.rpi.rc",
-    src: "android.hardware.health-service.rpi.rc",
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.health-service.rpi.xml",
-    src: "android.hardware.health-service.rpi.xml",
-    sub_dir: "vintf",
-    installable: false,
-}
-
-apex {
-    name: "com.android.hardware.health.rpi5",
-    manifest: "apex_manifest.json",
-    file_contexts: "apex_file_contexts",
-    key: "com.android.hardware.key",
-    certificate: ":com.android.hardware.certificate",
-    updatable: false,
-    vendor: true,
-
-    binaries: ["android.hardware.health-service.rpi"],
-    prebuilts: [
-        "android.hardware.health-service.rpi.rc",
-        "android.hardware.health-service.rpi.xml",
-    ],
 }

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

@@ -1,4 +1,4 @@
-service vendor.health-rpi /apex/com.android.hardware.health.rpi5/bin/hw/android.hardware.health-service.rpi
+service vendor.health-default /vendor/bin/hw/android.hardware.health-service.rpi
     class hal
     user system
     group system

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>4</version>
+        <version>3</version>
         <fqname>IHealth/default</fqname>
     </hal>
 </manifest>

health/apex_file_contexts

@@ -1,3 +0,0 @@
-(/.*)?                                          u:object_r:vendor_file:s0
-/etc(/.*)?                                      u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.health-service\.rpi  u:object_r:hal_health_default_exec:s0

health/apex_manifest.json

@@ -1,4 +0,0 @@
-{
-    "name": "com.android.hardware.health.rpi5",
-    "version": 1
-}

keylayout/Generic-tv.kl

@@ -1,459 +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 range 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 1     ESCAPE
-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 12    MINUS
-key 13    EQUALS
-key 14    DEL
-key 15    TAB
-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 28    DPAD_CENTER
-key 29    CTRL_LEFT
-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 41    GRAVE
-key 42    SHIFT_LEFT
-key 43    BACKSLASH
-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 54    SHIFT_RIGHT
-key 55    NUMPAD_MULTIPLY
-key 56    ALT_LEFT
-key 57    SPACE
-key 58    CAPS_LOCK
-key 59    F1
-key 60    F2
-key 61    F3
-key 62    F4
-key 63    F5
-key 64    F6
-key 65    F7
-key 66    F8
-key 67    F9
-key 68    F10
-key 69    NUM_LOCK
-key 70    SCROLL_LOCK
-key 71    NUMPAD_7
-key 72    NUMPAD_8
-key 73    NUMPAD_9
-key 74    NUMPAD_SUBTRACT
-key 75    NUMPAD_4
-key 76    NUMPAD_5
-key 77    NUMPAD_6
-key 78    NUMPAD_ADD
-key 79    NUMPAD_1
-key 80    NUMPAD_2
-key 81    NUMPAD_3
-key 82    NUMPAD_0
-key 83    NUMPAD_DOT
-# key 84 (undefined)
-key 85    ZENKAKU_HANKAKU
-key 86    BACKSLASH
-key 87    F11
-key 88    F12
-key 89    RO
-# key 90 "KEY_KATAKANA"
-# key 91 "KEY_HIRAGANA"
-key 92    HENKAN
-key 93    KATAKANA_HIRAGANA
-key 94    MUHENKAN
-key 95    NUMPAD_COMMA
-key 96    NUMPAD_ENTER
-key 97    CTRL_RIGHT
-key 98    NUMPAD_DIVIDE
-key 99    SYSRQ
-key 100   ALT_RIGHT
-# key 101 "KEY_LINEFEED"
-key 102   MOVE_HOME
-key 103   DPAD_UP
-key 104   PAGE_UP
-key 105   DPAD_LEFT
-key 106   DPAD_RIGHT
-key 107   MOVE_END
-key 108   DPAD_DOWN
-key 109   PAGE_DOWN
-key 110   INSERT
-key 111   FORWARD_DEL
-# key 112 "KEY_MACRO"
-key 113   VOLUME_MUTE
-key 114   VOLUME_DOWN
-key 115   VOLUME_UP
-key 116   POWER
-key 117   NUMPAD_EQUALS
-# key 118 "KEY_KPPLUSMINUS"
-key 119   BREAK
-# key 120 (undefined)
-key 121   NUMPAD_COMMA
-key 122   KANA
-key 123   EISU
-key 124   YEN
-key 125   META_LEFT
-key 126   META_RIGHT
-key 127   MENU
-key 128   MEDIA_STOP
-# key 129 "KEY_AGAIN"
-# key 130 "KEY_PROPS"
-# key 131 "KEY_UNDO"
-# key 132 "KEY_FRONT"
-key 133   COPY
-# key 134 "KEY_OPEN"
-key 135   PASTE
-# key 136 "KEY_FIND"
-key 137   CUT
-# key 138 "KEY_HELP"
-key 139   MENU
-key 140   CALCULATOR
-# key 141 "KEY_SETUP"
-key 142   SLEEP
-key 143   WAKEUP
-# key 144 "KEY_FILE"
-# key 145 "KEY_SENDFILE"
-# key 146 "KEY_DELETEFILE"
-# key 147 "KEY_XFER"
-# key 148 "KEY_PROG1"
-# key 149 "KEY_PROG2"
-key 150   EXPLORER
-# key 151 "KEY_MSDOS"
-key 152   POWER
-# key 153 "KEY_DIRECTION"
-# key 154 "KEY_CYCLEWINDOWS"
-key 155   ENVELOPE
-key 156   BOOKMARK
-# key 157 "KEY_COMPUTER"
-key 158   BACK
-key 159   FORWARD
-key 160   MEDIA_CLOSE
-key 161   MEDIA_EJECT
-key 162   MEDIA_EJECT
-key 163   MEDIA_NEXT
-key 164   MEDIA_PLAY_PAUSE
-key 165   MEDIA_PREVIOUS
-key 166   MEDIA_STOP
-key 167   MEDIA_RECORD
-key 168   MEDIA_REWIND
-key 169   CALL
-# key 170 "KEY_ISO"
-key 171   MUSIC
-key 172   HOME
-key 173   REFRESH
-# key 174 "KEY_EXIT"
-# key 175 "KEY_MOVE"
-# key 176 "KEY_EDIT"
-key 177   PAGE_UP
-key 178   PAGE_DOWN
-key 179   NUMPAD_LEFT_PAREN
-key 180   NUMPAD_RIGHT_PAREN
-# key 181 "KEY_NEW"
-# key 182 "KEY_REDO"
-# key 183   F13
-# key 184   F14
-# key 185   F15
-# key 186   F16
-# key 187   F17
-# key 188   F18
-# key 189   F19
-# key 190   F20
-# key 191   F21
-# key 192   F22
-# key 193   F23
-# key 194   F24
-# key 195 (undefined)
-# key 196 (undefined)
-# key 197 (undefined)
-# key 198 (undefined)
-# key 199 (undefined)
-key 200   MEDIA_PLAY
-key 201   MEDIA_PAUSE
-# key 202 "KEY_PROG3"
-# key 203 "KEY_PROG4"
-key 204   NOTIFICATION
-# key 205 "KEY_SUSPEND"
-# key 206 "KEY_CLOSE"
-key 207   MEDIA_PLAY
-key 208   MEDIA_FAST_FORWARD
-# key 209 "KEY_BASSBOOST"
-# key 210 "KEY_PRINT"
-# key 211 "KEY_HP"
-key 212   CAMERA
-key 213   MUSIC
-# key 214 "KEY_QUESTION"
-key 215   ENVELOPE
-# key 216 "KEY_CHAT"
-key 217   ASSIST
-# key 218 "KEY_CONNECT"
-# key 219 "KEY_FINANCE"
-# key 220 "KEY_SPORT"
-# key 221 "KEY_SHOP"
-# key 222 "KEY_ALTERASE"
-# key 223 "KEY_CANCEL"
-key 224   BRIGHTNESS_DOWN
-key 225   BRIGHTNESS_UP
-key 226   HEADSETHOOK
-
-key 256   BUTTON_1
-key 257   BUTTON_2
-key 258   BUTTON_3
-key 259   BUTTON_4
-key 260   BUTTON_5
-key 261   BUTTON_6
-key 262   BUTTON_7
-key 263   BUTTON_8
-key 264   BUTTON_9
-key 265   BUTTON_10
-key 266   BUTTON_11
-key 267   BUTTON_12
-key 268   BUTTON_13
-key 269   BUTTON_14
-key 270   BUTTON_15
-key 271   BUTTON_16
-
-key 288   BUTTON_1
-key 289   BUTTON_2
-key 290   BUTTON_3
-key 291   BUTTON_4
-key 292   BUTTON_5
-key 293   BUTTON_6
-key 294   BUTTON_7
-key 295   BUTTON_8
-key 296   BUTTON_9
-key 297   BUTTON_10
-key 298   BUTTON_11
-key 299   BUTTON_12
-key 300   BUTTON_13
-key 301   BUTTON_14
-key 302   BUTTON_15
-key 303   BUTTON_16
-
-
-key 304   BUTTON_A
-key 305   BUTTON_B
-key 306   BUTTON_C
-key 307   BUTTON_X
-key 308   BUTTON_Y
-key 309   BUTTON_Z
-key 310   BUTTON_L1
-key 311   BUTTON_R1
-key 312   BUTTON_L2
-key 313   BUTTON_R2
-key 314   BUTTON_SELECT
-key 315   BUTTON_START
-key 316   BUTTON_MODE
-key 317   BUTTON_THUMBL
-key 318   BUTTON_THUMBR
-
-
-# key 352 "KEY_OK"
-key 353   DPAD_CENTER
-# key 354 "KEY_GOTO"
-# key 355 "KEY_CLEAR"
-# key 356 "KEY_POWER2"
-# key 357 "KEY_OPTION"
-# key 358 "KEY_INFO"
-# key 359 "KEY_TIME"
-# key 360 "KEY_VENDOR"
-# key 361 "KEY_ARCHIVE"
-key 362   GUIDE
-# key 363 "KEY_CHANNEL"
-# key 364 "KEY_FAVORITES"
-# key 365 "KEY_EPG"
-key 366   DVR
-# key 367 "KEY_MHP"
-# key 368 "KEY_LANGUAGE"
-# key 369 "KEY_TITLE"
-key 370   CAPTIONS
-# key 371 "KEY_ANGLE"
-# key 372 "KEY_ZOOM"
-# key 373 "KEY_MODE"
-# key 374 "KEY_KEYBOARD"
-# key 375 "KEY_SCREEN"
-# key 376 "KEY_PC"
-key 377   TV
-# key 378 "KEY_TV2"
-# key 379 "KEY_VCR"
-# key 380 "KEY_VCR2"
-# key 381 "KEY_SAT"
-# key 382 "KEY_SAT2"
-# key 383 "KEY_CD"
-# key 384 "KEY_TAPE"
-# key 385 "KEY_RADIO"
-# key 386 "KEY_TUNER"
-# key 387 "KEY_PLAYER"
-# key 388 "KEY_TEXT"
-# key 389 "KEY_DVD"
-# key 390 "KEY_AUX"
-# key 391 "KEY_MP3"
-# key 392 "KEY_AUDIO"
-# key 393 "KEY_VIDEO"
-# key 394 "KEY_DIRECTORY"
-# key 395 "KEY_LIST"
-# key 396 "KEY_MEMO"
-key 397   CALENDAR
-key 398   PROG_RED
-key 399   PROG_GREEN
-key 400   PROG_YELLOW
-key 401   PROG_BLUE
-key 402   CHANNEL_UP
-key 403   CHANNEL_DOWN
-# key 404 "KEY_FIRST"
-key 405   LAST_CHANNEL
-# key 406 "KEY_AB"
-# key 407 "KEY_NEXT"
-# key 408 "KEY_RESTART"
-# key 409 "KEY_SLOW"
-# key 410 "KEY_SHUFFLE"
-# key 411 "KEY_BREAK"
-# key 412 "KEY_PREVIOUS"
-# key 413 "KEY_DIGITS"
-# key 414 "KEY_TEEN"
-# key 415 "KEY_TWEN"
-
-key 429   CONTACTS
-
-# key 448 "KEY_DEL_EOL"
-# key 449 "KEY_DEL_EOS"
-# key 450 "KEY_INS_LINE"
-# key 451 "KEY_DEL_LINE"
-
-
-key 464   FUNCTION
-key 465   ESCAPE            FUNCTION
-key 466   F1                FUNCTION
-key 467   F2                FUNCTION
-key 468   F3                FUNCTION
-key 469   F4                FUNCTION
-key 470   F5                FUNCTION
-key 471   F6                FUNCTION
-key 472   F7                FUNCTION
-key 473   F8                FUNCTION
-key 474   F9                FUNCTION
-key 475   F10               FUNCTION
-key 476   F11               FUNCTION
-key 477   F12               FUNCTION
-key 478   1                 FUNCTION
-key 479   2                 FUNCTION
-key 480   D                 FUNCTION
-key 481   E                 FUNCTION
-key 482   F                 FUNCTION
-key 483   S                 FUNCTION
-key 484   B                 FUNCTION
-
-
-# key 497 KEY_BRL_DOT1
-# key 498 KEY_BRL_DOT2
-# key 499 KEY_BRL_DOT3
-# key 500 KEY_BRL_DOT4
-# key 501 KEY_BRL_DOT5
-# key 502 KEY_BRL_DOT6
-# key 503 KEY_BRL_DOT7
-# key 504 KEY_BRL_DOT8
-
-key 522   STAR
-key 523   POUND
-key 580   APP_SWITCH
-key 582   VOICE_ASSIST
-
-# CEC
-key 352   ENTER
-key 618   HOME
-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 0x0c0173 MEDIA_AUDIO_TRACK
-
-# Joystick and game controller axes.
-# Axes that are not mapped will be assigned generic axis numbers by the input subsystem.
-axis 0x00 X
-axis 0x01 Y
-axis 0x02 Z
-axis 0x03 RX
-axis 0x04 RY
-axis 0x05 RZ
-axis 0x06 THROTTLE
-axis 0x07 RUDDER
-axis 0x08 WHEEL
-axis 0x09 GAS
-axis 0x0a BRAKE
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
-
-# LEDs
-led 0x00 NUM_LOCK
-led 0x01 CAPS_LOCK
-led 0x02 SCROLL_LOCK
-led 0x03 COMPOSE
-led 0x04 KANA
-led 0x05 SLEEP
-led 0x06 SUSPEND
-led 0x07 MUTE
-led 0x08 MISC
-led 0x09 MAIL
-led 0x0a CHARGING
-
-# SENSORs
-sensor 0x00 ACCELEROMETER X
-sensor 0x01 ACCELEROMETER Y
-sensor 0x02 ACCELEROMETER Z
-sensor 0x03 GYROSCOPE X
-sensor 0x04 GYROSCOPE Y
-sensor 0x05 GYROSCOPE Z

keylayout/Generic.kl

@@ -171,7 +171,7 @@ key 143   WAKEUP
 # key 149 "KEY_PROG2"
 key 150   EXPLORER
 # key 151 "KEY_MSDOS"
-key 152   LOCK
+key 152   POWER
 # key 153 "KEY_DIRECTION"
 # key 154 "KEY_CYCLEWINDOWS"
 key 155   ENVELOPE
@@ -200,20 +200,20 @@ key 177   PAGE_UP
 key 178   PAGE_DOWN
 key 179   NUMPAD_LEFT_PAREN
 key 180   NUMPAD_RIGHT_PAREN
-key 181   NEW
+# key 181 "KEY_NEW"
 # key 182 "KEY_REDO"
-key 183   F13
-key 184   F14
-key 185   F15
-key 186   F16
-key 187   F17
-key 188   F18
-key 189   F19
-key 190   F20
-key 191   F21
-key 192   F22
-key 193   F23
-key 194   F24
+# key 183   F13
+# key 184   F14
+# key 185   F15
+# key 186   F16
+# key 187   F17
+# key 188   F18
+# key 189   F19
+# key 190   F20
+# key 191   F21
+# key 192   F22
+# key 193   F23
+# key 194   F24
 # key 195 (undefined)
 # key 196 (undefined)
 # key 197 (undefined)
@@ -225,11 +225,11 @@ key 201   MEDIA_PAUSE
 # key 203 "KEY_PROG4"
 key 204 NOTIFICATION
 # key 205 "KEY_SUSPEND"
-key 206   CLOSE
+# key 206 "KEY_CLOSE"
 key 207   MEDIA_PLAY
 key 208   MEDIA_FAST_FORWARD
 # key 209 "KEY_BASSBOOST"
-key 210   PRINT
+# key 210 "KEY_PRINT"
 # key 211 "KEY_HP"
 key 212   CAMERA
 key 213   MUSIC
@@ -328,7 +328,7 @@ key 368   LANGUAGE_SWITCH
 # key 369 "KEY_TITLE"
 key 370   CAPTIONS
 # key 371 "KEY_ANGLE"
-key 372   FULLSCREEN
+# key 372 "KEY_ZOOM"
 # key 373 "KEY_MODE"
 # key 374 "KEY_KEYBOARD"
 # key 375 "KEY_SCREEN"
@@ -424,8 +424,6 @@ key 580   APP_SWITCH
 key 582   VOICE_ASSIST
 # Linux KEY_ASSISTANT
 key 583   ASSIST
-key 585   EMOJI_PICKER
-key 586   DICTATE
 key 656   MACRO_1
 key 657   MACRO_2
 key 658   MACRO_3
@@ -438,29 +436,15 @@ key 141   POWER
 key 174   BACK
 
 # Keys defined by HID usages
-key usage 0x010082 LOCK                      FALLBACK_USAGE_MAPPING
-key usage 0x01009B DO_NOT_DISTURB            FALLBACK_USAGE_MAPPING
-key usage 0x0c0065 SCREENSHOT                FALLBACK_USAGE_MAPPING
 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 0x0c00D8 DICTATE                   FALLBACK_USAGE_MAPPING
-key usage 0x0c00D9 EMOJI_PICKER              FALLBACK_USAGE_MAPPING
 key usage 0x0c0173 MEDIA_AUDIO_TRACK         FALLBACK_USAGE_MAPPING
 key usage 0x0c019C PROFILE_SWITCH            FALLBACK_USAGE_MAPPING
-key usage 0x0c019F SETTINGS                  FALLBACK_USAGE_MAPPING
 key usage 0x0c01A2 ALL_APPS                  FALLBACK_USAGE_MAPPING
-key usage 0x0c0201 NEW                       FALLBACK_USAGE_MAPPING
-key usage 0x0c0203 CLOSE                     FALLBACK_USAGE_MAPPING
-key usage 0x0c0208 PRINT                     FALLBACK_USAGE_MAPPING
-key usage 0x0c0227 REFRESH                   FALLBACK_USAGE_MAPPING
-key usage 0x0c0232 FULLSCREEN                FALLBACK_USAGE_MAPPING
-key usage 0x0c029D LANGUAGE_SWITCH           FALLBACK_USAGE_MAPPING
-key usage 0x0c029F RECENT_APPS               FALLBACK_USAGE_MAPPING
-key usage 0x0c02A2 ALL_APPS                  FALLBACK_USAGE_MAPPING
 key usage 0x0d0044 STYLUS_BUTTON_PRIMARY     FALLBACK_USAGE_MAPPING
 key usage 0x0d005a STYLUS_BUTTON_SECONDARY   FALLBACK_USAGE_MAPPING
 

light/Android.bp

@@ -7,43 +7,15 @@ cc_binary {
     name: "android.hardware.light-service.rpi",
     relative_install_path: "hw",
     vendor: true,
+    init_rc: ["android.hardware.light-service.rpi.rc"],
+    vintf_fragments: ["android.hardware.light-service.rpi.xml"],
     srcs: [
         "Lights.cpp",
         "main.cpp",
     ],
     shared_libs: [
-        "android.hardware.light-V2-ndk",
         "libbase",
         "libbinder_ndk",
-    ],
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.light-service.rpi.rc",
-    src: "android.hardware.light-service.rpi.rc",
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.light-service.rpi.xml",
-    src: "android.hardware.light-service.rpi.xml",
-    sub_dir: "vintf",
-    installable: false,
-}
-
-apex {
-    name: "com.android.hardware.light.rpi5",
-    manifest: "apex_manifest.json",
-    file_contexts: "apex_file_contexts",
-    key: "com.android.hardware.key",
-    certificate: ":com.android.hardware.certificate",
-    updatable: false,
-    vendor: true,
-
-    binaries: ["android.hardware.light-service.rpi"],
-    prebuilts: [
-        "android.hardware.light-service.rpi.rc",
-        "android.hardware.light-service.rpi.xml",
+        "android.hardware.light-V2-ndk",
     ],
 }

light/Lights.cpp

@@ -15,59 +15,31 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.light-service.rpi"
-
 #include "Lights.h"
 
 #include <android-base/file.h>
-#include <android-base/logging.h>
 
-using ::android::base::ReadFileToString;
 using ::android::base::WriteStringToFile;
 
 namespace aidl::android::hardware::light {
 
-static const uint32_t defaultMaxBrightness = 255;
-
-static const std::string backlightBasePath = "/sys/class/backlight/";
-
-static const std::string backlightPaths[] = {
-    "10-0045",
-    "11-0045",
-    "rpi_backlight",
+static const std::string backlightFiles[] = {
+    "/sys/class/backlight/rpi_backlight/brightness"
 };
 
-static const std::vector<HwLight> availableLights = {
+const static std::vector<HwLight> availableLights = {
     {.id = (int)LightType::BACKLIGHT, .type = LightType::BACKLIGHT, .ordinal = 0}
 };
 
-Lights::Lights() {
-    maxBrightness = defaultMaxBrightness;
-
-    for (auto &path : backlightPaths) {
-        std::string backlightMaxBrightnessPath = backlightBasePath + path + "/max_brightness";
-        if (!access(backlightMaxBrightnessPath.c_str(), R_OK)) {
-            std::string maxBrightnessValue;
-            if (ReadFileToString(backlightMaxBrightnessPath, &maxBrightnessValue)) {
-                maxBrightness = std::stoi(maxBrightnessValue);
-                LOG(INFO) << backlightMaxBrightnessPath << " = " << maxBrightnessValue;
-                break;
-            }
-        }
-    }
-}
-
 ndk::ScopedAStatus Lights::setLightState(int id, const HwLightState& state) {
     HwLight const& light = availableLights[id];
-    std::string const brightness = std::to_string(rgbToScaledBrightness(state, maxBrightness));
+    std::string const brightness = std::to_string(rgbToBrightness(state));
 
     switch (light.type) {
         case LightType::BACKLIGHT:
-            for (auto &path : backlightPaths) {
-                std::string backlightBrightnessPath = backlightBasePath + path + "/brightness";
-                if (!access(backlightBrightnessPath.c_str(), W_OK)) {
-                   WriteStringToFile(brightness, backlightBrightnessPath);
-                   break;
+            for (auto &file : backlightFiles) {
+                if (!access(file.c_str(), W_OK)) {
+                    WriteStringToFile(brightness, file);
                 }
             }
             break;
@@ -86,11 +58,10 @@ ndk::ScopedAStatus Lights::getLights(std::vector<HwLight>* lights) {
     return ndk::ScopedAStatus::ok();
 }
 
-uint32_t Lights::rgbToScaledBrightness(const HwLightState& state, uint32_t maxBrightness) {
+uint32_t Lights::rgbToBrightness(const HwLightState& state) {
     uint32_t color = state.color & 0x00ffffff;
-    uint32_t brightness = ((77 * ((color >> 16) & 0xff)) + (150 * ((color >> 8) & 0xff)) +
+    return ((77 * ((color >> 16) & 0xff)) + (150 * ((color >> 8) & 0xff)) +
             (29 * (color & 0xff))) >> 8;
-    return brightness * maxBrightness / 0xff;
 }
 
 }  // aidl::android::hardware::light

light/Lights.h

@@ -23,14 +23,11 @@ namespace aidl::android::hardware::light {
 
 class Lights : public BnLights {
 public:
-    Lights();
-
     ndk::ScopedAStatus setLightState(int id, const HwLightState& state) override;
     ndk::ScopedAStatus getLights(std::vector<HwLight>* types) override;
 
 private:
-    uint32_t maxBrightness;
-    uint32_t rgbToScaledBrightness(const HwLightState& state, uint32_t maxBrightness);
+    uint32_t rgbToBrightness(const HwLightState& state);
 };
 
 }  // aidl::android::hardware::light

light/android.hardware.light-service.rpi.rc

@@ -1,18 +1,8 @@
 on early-boot
-    chown system system /sys/class/backlight/10-0045/brightness
-    chown system system /sys/class/backlight/10-0045/max_brightness
-    chown system system /sys/class/backlight/11-0045/brightness
-    chown system system /sys/class/backlight/11-0045/max_brightness
     chown system system /sys/class/backlight/rpi_backlight/brightness
-    chown system system /sys/class/backlight/rpi_backlight/max_brightness
-    chmod 660 /sys/class/backlight/10-0045/brightness
-    chmod 440 /sys/class/backlight/10-0045/max_brightness
-    chmod 660 /sys/class/backlight/11-0045/brightness
-    chmod 440 /sys/class/backlight/11-0045/max_brightness
     chmod 660 /sys/class/backlight/rpi_backlight/brightness
-    chmod 440 /sys/class/backlight/rpi_backlight/max_brightness
 
-service vendor.light-rpi /apex/com.android.hardware.light.rpi5/bin/hw/android.hardware.light-service.rpi
+service vendor.light-default /vendor/bin/hw/android.hardware.light-service.rpi
     class hal
     user system
     group system

light/apex_file_contexts

@@ -1,3 +0,0 @@
-(/.*)?                                         u:object_r:vendor_file:s0
-/etc(/.*)?                                     u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.light-service\.rpi  u:object_r:hal_light_default_exec:s0

light/apex_manifest.json

@@ -1,4 +0,0 @@
-{
-    "name": "com.android.hardware.light.rpi5",
-    "version": 1
-}

light/main.cpp

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2022 The Android Open Source Project
- * Copyright (C) 2025 KonstaKANG
+ * 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.
@@ -32,5 +31,5 @@ int main() {
     CHECK(status == STATUS_OK);
 
     ABinderProcess_joinThreadPool();
-    return EXIT_FAILURE;  // should not reach
+    return EXIT_FAILURE;  // should not reached
 }

manifest.xml

@@ -17,13 +17,39 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.bluetooth</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IBluetoothHci</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl">
         <name>android.hardware.camera.provider</name>
         <version>1</version>
         <interface>
             <name>ICameraProvider</name>
             <instance>external/0</instance>
-            <instance>libcamera/0</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.camera.provider</name>
+        <transport>hwbinder</transport>
+        <version>2.5</version>
+        <interface>
+            <name>ICameraProvider</name>
+            <instance>legacy/0</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.composer</name>
+        <transport>hwbinder</transport>
+        <version>2.4</version>
+        <interface>
+            <name>IComposer</name>
+            <instance>default</instance>
         </interface>
     </hal>
 </manifest>

media/media_codecs_ffmpeg_c2.xml

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2022 Michael Goffioul <michael.goffioul@gmail.com>
-     Copyright (C) 2025 KonstaKANG
-
-     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.
--->
-
-<MediaCodecs>
-    <Decoders>
-        <!-- Audio codecs -->
-        <MediaCodec name="c2.ffmpeg.aac.decoder" type="audio/mp4a-latm">
-            <Alias name="OMX.ffmpeg.aac.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.ac3.decoder" type="audio/ac3">
-            <Alias name="OMX.ffmpeg.ac3.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.alac.decoder" type="audio/alac">
-            <Alias name="OMX.ffmpeg.alac.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.flac.decoder" type="audio/flac">
-            <Alias name="OMX.ffmpeg.flac.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.mp2.decoder" type="audio/mpeg-L2">
-            <Alias name="OMX.ffmpeg.mp2.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.mp3.decoder" type="audio/mpeg">
-            <Alias name="OMX.ffmpeg.mp3.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.vorbis.decoder" type="audio/vorbis">
-            <Alias name="OMX.ffmpeg.vorbisac3.decoder" />
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="8000-192000" />
-        </MediaCodec>
-
-        <!-- Video codecs -->
-        <MediaCodec name="c2.ffmpeg.av1.decoder" type="video/av01">
-            <Alias name="OMX.ffmpeg.av1.decoder" />
-            <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.h263.decoder" type="video/3gpp">
-            <Alias name="OMX.ffmpeg.h263.decoder" />
-            <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.h264.decoder" type="video/avc">
-            <Alias name="OMX.ffmpeg.h264.decoder" />
-            <Limit name="size" min="2x2" max="4080x4080" />
-            <Limit name="alignment" value="2x2" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.hevc.decoder" type="video/hevc">
-            <Alias name="OMX.ffmpeg.hevc.decoder" />
-            <Limit name="size" min="2x2" max="4096x4096" />
-            <Limit name="alignment" value="2x2" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.mpeg2.decoder" type="video/mpeg2">
-            <Alias name="OMX.ffmpeg.mpeg2.decoder" />
-            <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.mpeg4.decoder" type="video/mp4v-es">
-            <Alias name="OMX.ffmpeg.mpeg4.decoder" />
-            <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.vp8.decoder" type="video/x-vnd.on2.vp8">
-            <Alias name="OMX.ffmpeg.vp8.decoder" />
-            <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="c2.ffmpeg.vp9.decoder" type="video/x-vnd.on2.vp9">
-            <Alias name="OMX.ffmpeg.vp9.decoder" />
-            <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-    </Decoders>
-</MediaCodecs>

mkbootimg.mk

@@ -13,7 +13,7 @@ $(RPI_BOOT_OUT): $(INSTALLED_RAMDISK_TARGET)
 	mkdir -p $(RPI_BOOT_OUT)/overlays
 	cp $(DEVICE_PATH)/boot/* $(RPI_BOOT_OUT)
 	cp $(KERNEL_PATH)/Image $(RPI_BOOT_OUT)
-	cp $(KERNEL_PATH)/bcm2712*-rpi-*.dtb $(RPI_BOOT_OUT)
+	cp $(KERNEL_PATH)/bcm2712-rpi-*.dtb $(RPI_BOOT_OUT)
 	cp $(KERNEL_PATH)/overlays/* $(RPI_BOOT_OUT)/overlays
 	cp $(PRODUCT_OUT)/ramdisk.img $(RPI_BOOT_OUT)
 	echo $(BOARD_KERNEL_CMDLINE) > $(RPI_BOOT_OUT)/cmdline.txt

mkimg.sh

@@ -25,7 +25,7 @@ for PARTITION in "boot" "system" "vendor"; do
   fi
 done
 
-VERSION=RaspberryVanillaAOSP15
+VERSION=RaspberryVanillaAOSP14
 DATE=$(date +%Y%m%d)
 TARGET=$(echo ${TARGET_PRODUCT} | sed 's/^aosp_//')
 IMGNAME=${VERSION}-${DATE}-${TARGET}.img

overlay/BluetoothRpiOverlay/Android.bp

@@ -1,10 +0,0 @@
-// Copyright (C) 2021-2022 KonstaKANG
-//
-// SPDX-License-Identifier: Apache-2.0
-
-runtime_resource_overlay {
-    name: "BluetoothRpiOverlay",
-    resource_dirs: ["res"],
-    sdk_version: "current",
-    vendor: true,
-}

overlay/BluetoothRpiOverlay/AndroidManifest.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright (C) 2021-2022 KonstaKANG
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.bluetooth.resources.rpi"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-        android:targetPackage="com.android.bluetooth"
-        android:isStatic="true"
-        android:priority="0" />
-</manifest>

overlay/BluetoothRpiOverlay/res/values/config.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2009-2012 Broadcom Corporation
-     Copyright (C) 2021-2022 KonstaKANG
-
-     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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- If true, device requests audio focus and start avrcp updates on source start or play -->
-    <bool name="a2dp_sink_automatically_request_audio_focus">true</bool>
-
-</resources>

overlay/WifiRpiOverlay/res/values/config.xml

@@ -30,9 +30,6 @@
          capability can provide power savings when wifi needs to be always kept on. -->
     <bool translatable="false" name="config_wifi_background_scan_support">true</bool>
 
-    <!-- Wifi driver supports IEEE80211AC for softap -->
-    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
-
     <!-- Do not translate. Default access point SSID used for tethering -->
     <string name="wifi_tether_configure_ssid_default" translatable="false">Raspberry Pi 5</string>
 

product_manifest.xml

@@ -1 +0,0 @@
-<manifest version="1.0" type="framework" />

ramdisk/fstab.rpi5

@@ -7,4 +7,3 @@
 /dev/block/mmcblk0p3                       /vendor      ext4    ro,barrier=1                                        wait,first_stage_mount
 /dev/block/mmcblk0p4                       /data        ext4    noatime,nosuid,nodev,nomblk_io_submit,errors=panic  wait,check,formattable,quota
 /devices/platform/axi/*.pcie/*.usb/*/usb*  auto         auto    defaults                                            voldmanaged=usb:auto
-/devices/platform/axi/*.usb/usb*           auto         auto    defaults                                            voldmanaged=usb:auto

ramdisk/init.rpi5.rc

@@ -5,3 +5,9 @@ on init
 
 on fs
     mount_all /vendor/etc/fstab.rpi5
+
+on post-fs-data
+    # Create the directories used by the Wireless subsystem
+    mkdir /data/vendor/wifi 0770 wifi wifi
+    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
+    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi

seccomp_policy/android.hardware.media.c2-ffmpeg.policy

@@ -1,57 +0,0 @@
-# device specific syscalls
-clock_gettime: 1
-clone: 1
-close: 1
-dup: 1
-eventfd2: 1
-exit_group: 1
-exit: 1
-faccessat: 1
-fstat: 1
-fstatfs: 1
-ftruncate: 1
-futex: 1
-getdents64: 1
-getegid: 1
-geteuid: 1
-getgid: 1
-getgroups: 1
-getpid: 1
-getrandom: 1
-getrlimit: 1
-gettid: 1
-gettimeofday: 1
-getuid: 1
-ioctl: 1
-lseek: 1
-madvise: 1
-memfd_create: 1
-mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-mremap: arg3 == 3 || arg3 == MREMAP_MAYMOVE
-munmap: 1
-nanosleep: 1
-newfstatat: 1
-openat: 1
-pipe2: 1
-ppoll: 1
-prctl: 1
-pread64: 1
-process_vm_readv: 1
-read: 1
-readlinkat: 1
-recvmsg: 1
-restart_syscall: 1
-rt_sigaction: 1
-rt_sigprocmask: 1
-rt_sigreturn: 1
-rt_tgsigqueueinfo: 1
-sched_getaffinity: 1
-sched_yield: 1
-set_tid_address: 1
-setpriority: 1
-sigaltstack: 1
-sysinfo: 1
-tgkill: 1
-write: 1
-writev: 1

sepolicy/file.te

@@ -1,2 +0,0 @@
-type mediadrm_vendor_data_file, file_type, data_file_type;
-type sysfs_hdmi, fs_type, sysfs_type;

sepolicy/file_contexts

@@ -1,29 +1,49 @@
-# Camera
-/vendor/bin/hw/android\.hardware\.camera\.provider-V1-libcamera-service  u:object_r:hal_camera_default_exec:s0
+# Bluetooth
+/sys/class/rfkill/rfkill[0-9]/state                                          u:object_r:sysfs_bluetooth_writable:s0
 
 # CEC
-/dev/cec0  u:object_r:cec_device:s0
-/dev/cec1  u:object_r:cec_device:s0
+/dev/cec0                                                                    u:object_r:cec_device:s0
+/dev/cec1                                                                    u:object_r:cec_device:s0
+/vendor/bin/hw/android\.hardware\.tv\.cec@1\.0-service\.rpi                  u:object_r:hal_tv_cec_default_exec:s0
 
 # DRM
-/data/vendor/mediadrm(/.*)?  u:object_r:mediadrm_vendor_data_file:s0
+/vendor/bin/hw/android\.hardware\.drm-service\.clearkey                      u:object_r:hal_drm_clearkey_exec:s0
+/vendor/bin/hw/android\.hardware\.drm-service\.widevine(.*)?                 u:object_r:hal_drm_widevine_exec:s0
+
+# FFmpeg
+/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-ffmpeg              u:object_r:mediacodec_exec:s0
+
+# Gatekeeper
+/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software          u:object_r:hal_gatekeeper_default_exec:s0
 
 # Graphics
-/dev/dri(/.*)?                                                                   u:object_r:gpu_device:s0
-/vendor/bin/hw/android\.hardware\.graphics\.allocator-service\.minigbm_gbm_mesa  u:object_r:hal_graphics_allocator_default_exec:s0
-/vendor/lib64/hw/mapper\.minigbm_gbm_mesa\.so                                    u:object_r:same_process_hal_file:s0
-/vendor/lib64/hw/vulkan\.broadcom\.so                                            u:object_r:same_process_hal_file:s0
-/vendor/lib64/dri_gbm\.so                                                        u:object_r:same_process_hal_file:s0
-/vendor/lib64/libdrm\.so                                                         u:object_r:same_process_hal_file:s0
-/vendor/lib64/libgallium_dri\.so                                                 u:object_r:same_process_hal_file:s0
-/vendor/lib64/libgbm_mesa\.so                                                    u:object_r:same_process_hal_file:s0
-/vendor/lib64/libgbm_mesa_wrapper\.so                                            u:object_r:same_process_hal_file:s0
-/vendor/lib64/libminigbm_gralloc_gbm_mesa\.so                                    u:object_r:same_process_hal_file:s0
-/vendor/lib64/libminigbm_gralloc4_utils_gbm_mesa\.so                             u:object_r:same_process_hal_file:s0
-/vendor/lib64/libui\.so                                                          u:object_r:same_process_hal_file:s0
+/dev/dri(/.*)?                                                                          u:object_r:gpu_device:s0
+/vendor/bin/hw/android\.hardware\.graphics\.allocator@4\.0-service\.minigbm_gbm_mesa    u:object_r:hal_graphics_allocator_default_exec:s0
+/vendor/lib(64)?/hw/android\.hardware\.graphics.mapper@4\.0-impl\.minigbm_gbm_mesa\.so  u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/hw/vulkan\.broadcom\.so                                                u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/dri_gbm\.so                                                            u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libdrm\.so                                                             u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libgallium_dri\.so                                                     u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libgbm_mesa\.so                                                        u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libgbm_mesa_wrapper\.so                                                u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libminigbm_gralloc_gbm_mesa\.so                                        u:object_r:same_process_hal_file:s0
+
+# Health
+/vendor/bin/hw/android\.hardware\.health-service\.rpi                        u:object_r:hal_health_default_exec:s0
+
+# Lights
+/sys/class/backlight/rpi_backlight/brightness                                u:object_r:sysfs_leds:s0
+/sys/devices/platform/rpi_backlight/backlight/rpi_backlight/brightness       u:object_r:sysfs_leds:s0
+/vendor/bin/hw/android\.hardware\.light-service\.rpi                         u:object_r:hal_light_default_exec:s0
 
 # Partitions
-/dev/block/mmcblk0p1  u:object_r:boot_block_device:s0
-/dev/block/mmcblk0p2  u:object_r:system_block_device:s0
-/dev/block/mmcblk0p3  u:object_r:system_block_device:s0
-/dev/block/mmcblk0p4  u:object_r:userdata_block_device:s0
+/dev/block/mmcblk0p1                                                         u:object_r:boot_block_device:s0
+/dev/block/mmcblk0p2                                                         u:object_r:system_block_device:s0
+/dev/block/mmcblk0p3                                                         u:object_r:system_block_device:s0
+/dev/block/mmcblk0p4                                                         u:object_r:userdata_block_device:s0
+
+# Suspend
+/vendor/bin/suspend_blocker_rpi                                              u:object_r:suspend_blocker_exec:s0
+
+# USB
+/vendor/bin/hw/android\.hardware\.usb\.gadget-service\.rpi                   u:object_r:hal_usb_gadget_default_exec:s0

sepolicy/genfs_contexts

@@ -1,22 +1,6 @@
-# CEC
-genfscon sysfs /devices/platform/axi/axi:gpu/drm/card1/card1-HDMI-A-1/status  u:object_r:sysfs_hdmi:s0
-genfscon sysfs /devices/platform/axi/axi:gpu/drm/card1/card1-HDMI-A-2/status  u:object_r:sysfs_hdmi:s0
-
 # Graphics
 genfscon sysfs /devices/platform/axi/1002000000.v3d  u:object_r:sysfs_gpu:s0
 genfscon sysfs /devices/platform/axi/axi:gpu         u:object_r:sysfs_gpu:s0
 
-# Lights
-genfscon sysfs /class/backlight/10-0045/brightness            u:object_r:sysfs_leds:s0
-genfscon sysfs /class/backlight/10-0045/max_brightness        u:object_r:sysfs_leds:s0
-genfscon sysfs /class/backlight/11-0045/brightness            u:object_r:sysfs_leds:s0
-genfscon sysfs /class/backlight/11-0045/max_brightness        u:object_r:sysfs_leds:s0
-genfscon sysfs /class/backlight/rpi_backlight/brightness      u:object_r:sysfs_leds:s0
-genfscon sysfs /class/backlight/rpi_backlight/max_brightness  u:object_r:sysfs_leds:s0
-
 # Serial number
 genfscon sysfs /firmware/devicetree/base/serial-number  u:object_r:sysfs_dt_firmware_android:s0
-
-# Suspend
-genfscon sysfs /devices/platform/soc/soc:rpi_rtc/rtc/rtc0/alarmtimer.0.auto/wakeup/wakeup1  u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/soc/soc:rpi_rtc/wakeup/wakeup0                             u:object_r:sysfs_wakeup:s0

sepolicy/hal_audio_default.te

@@ -1 +0,0 @@
-get_prop(hal_audio_default, vendor_audio_config_prop)

sepolicy/hal_drm_clearkey.te

@@ -1,5 +1,10 @@
 type hal_drm_clearkey, domain;
-type hal_drm_clearkey_exec, vendor_file_type, exec_type, file_type;
+type hal_drm_clearkey_exec, exec_type, vendor_file_type, file_type;
+
 init_daemon_domain(hal_drm_clearkey)
 
 hal_server_domain(hal_drm_clearkey, hal_drm)
+
+vndbinder_use(hal_drm_clearkey);
+
+allow hal_drm_clearkey hal_allocator_server:fd use;

sepolicy/hal_drm_widevine.te

@@ -1,8 +1,13 @@
 type hal_drm_widevine, domain;
-type hal_drm_widevine_exec, vendor_file_type, exec_type, file_type;
+type hal_drm_widevine_exec, exec_type, vendor_file_type, file_type;
+
 init_daemon_domain(hal_drm_widevine)
 
 hal_server_domain(hal_drm_widevine, hal_drm)
 
-allow hal_drm_widevine mediadrm_vendor_data_file:file create_file_perms;
-allow hal_drm_widevine mediadrm_vendor_data_file:dir create_dir_perms;
+vndbinder_use(hal_drm_widevine);
+
+allow hal_drm_widevine hal_allocator_server:fd use;
+allow hal_drm mediacodec:fd use;
+
+hal_client_domain(hal_drm_widevine, hal_graphics_composer);

sepolicy/hal_keymint_default.te

@@ -1 +0,0 @@
-get_prop(hal_keymint_default, serialno_prop)

sepolicy/hal_tv_cec_default.te

@@ -0,0 +1 @@
+allow hal_tv_cec_default cec_device:chr_file rw_file_perms;

sepolicy/hal_tv_hdmi_cec_default.te

@@ -1,2 +0,0 @@
-allow hal_tv_hdmi_cec_default cec_device:chr_file rw_file_perms;
-get_prop(hal_tv_hdmi_cec_default, vendor_hdmi_config_prop)

sepolicy/hal_tv_hdmi_connection_default.te

@@ -1 +0,0 @@
-allow hal_tv_hdmi_connection_default sysfs_hdmi:file r_file_perms;

sepolicy/keystore.te

@@ -1 +0,0 @@
-hal_client_domain(keystore, hal_gatekeeper)

sepolicy/mediacodec.te

@@ -1,2 +1 @@
 gpu_access(mediacodec)
-get_prop(mediacodec, vendor_ffmpeg_config_prop)

sepolicy/property.te

@@ -1,3 +0,0 @@
-vendor_internal_prop(vendor_audio_config_prop)
-vendor_internal_prop(vendor_ffmpeg_config_prop)
-vendor_internal_prop(vendor_hdmi_config_prop)

sepolicy/property_contexts

@@ -1,14 +0,0 @@
-# Audio
-persist.vendor.audio.device         u:object_r:vendor_audio_config_prop:s0
-persist.vendor.audio.hdmi.device    u:object_r:vendor_audio_config_prop:s0
-persist.vendor.audio.pcm.card.auto  u:object_r:vendor_audio_config_prop:s0
-persist.vendor.audio.pcm.card       u:object_r:vendor_audio_config_prop:s0
-persist.vendor.audio.pcm.device     u:object_r:vendor_audio_config_prop:s0
-
-# CEC
-persist.vendor.hdmi.cec_device  u:object_r:vendor_hdmi_config_prop:s0
-
-# FFmpeg
-persist.vendor.ffmpeg_codec2.rank.audio  u:object_r:vendor_ffmpeg_config_prop:s0
-persist.vendor.ffmpeg_codec2.rank.video  u:object_r:vendor_ffmpeg_config_prop:s0
-persist.vendor.ffmpeg_codec2.v4l2.h265   u:object_r:vendor_ffmpeg_config_prop:s0

sepolicy/service_contexts

@@ -1,12 +1 @@
-# Camera
-android.hardware.camera.provider.ICameraProvider/external/0   u:object_r:hal_camera_service:s0
-android.hardware.camera.provider.ICameraProvider/libcamera/0  u:object_r:hal_camera_service:s0
-
-# DRM
-android.hardware.drm.IDrmFactory/widevine  u:object_r:hal_drm_service:s0
-
-# Gatekeeper
-android.hardware.security.sharedsecret.ISharedSecret/gatekeeper  u:object_r:hal_gatekeeper_service:s0
-
-# Graphics
-mapper/minigbm_gbm_mesa  u:object_r:hal_graphics_mapper_service:s0
+android.hardware.drm.IDrmFactory/widevine                                    u:object_r:hal_drm_service:s0

sepolicy/vendor_init.te

@@ -1,3 +0,0 @@
-set_prop(vendor_init, vendor_audio_config_prop)
-set_prop(vendor_init, vendor_ffmpeg_config_prop)
-set_prop(vendor_init, vendor_hdmi_config_prop)

suspend_blocker/Android.bp

@@ -5,29 +5,8 @@
 
 cc_binary {
     name: "suspend_blocker_rpi",
+    init_rc: ["suspend_blocker_rpi.rc"],
     vendor: true,
     srcs: ["suspend_blocker_rpi.cpp"],
     shared_libs: ["libpower"],
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "suspend_blocker_rpi.rc",
-    src: "suspend_blocker_rpi.rc",
-    installable: false,
-}
-
-apex {
-    name: "com.android.hardware.suspend_blocker.rpi5",
-    manifest: "apex_manifest.json",
-    file_contexts: "apex_file_contexts",
-    key: "com.android.hardware.key",
-    certificate: ":com.android.hardware.certificate",
-    updatable: false,
-    vendor: true,
-
-    binaries: ["suspend_blocker_rpi"],
-    prebuilts: [
-        "suspend_blocker_rpi.rc",
-    ],
 }

suspend_blocker/apex_file_contexts

@@ -1,3 +0,0 @@
-(/.*)?                    u:object_r:vendor_file:s0
-/etc(/.*)?                u:object_r:vendor_configs_file:s0
-/bin/suspend_blocker_rpi  u:object_r:suspend_blocker_exec:s0

suspend_blocker/apex_manifest.json

@@ -1,4 +0,0 @@
-{
-    "name": "com.android.hardware.suspend_blocker.rpi5",
-    "version": 1
-}

suspend_blocker/suspend_blocker_rpi.rc

@@ -1,4 +1,4 @@
-service suspend_blocker_rpi /apex/com.android.hardware.suspend_blocker.rpi5/bin/suspend_blocker_rpi
-    class hal
+service suspend_blocker_rpi /vendor/bin/suspend_blocker_rpi
+    class early_hal  # Start together with system_suspend HAL
     group system
     user root

usb/Android.bp

@@ -5,49 +5,24 @@
 
 cc_binary {
     name: "android.hardware.usb.gadget-service.rpi",
+    defaults: ["hidl_defaults"],
     relative_install_path: "hw",
+    init_rc: ["android.hardware.usb.gadget-service.rpi.rc"],
+    vintf_fragments: ["android.hardware.usb.gadget-service.rpi.xml"],
     vendor: true,
     srcs: [
-        "MonitorFfs.cpp",
+        "service.cpp",
         "UsbGadget.cpp",
-        "UsbGadgetUtils.cpp",
-        "main.cpp",
     ],
     shared_libs: [
         "android.hardware.usb.gadget-V1-ndk",
-        "libbase",
         "libbinder_ndk",
+        "libbase",
+        "libcutils",
+        "libhardware",
+        "libhidlbase",
         "liblog",
         "libutils",
     ],
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.usb.gadget-service.rpi.rc",
-    src: "android.hardware.usb.gadget-service.rpi.rc",
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.usb.gadget-service.rpi.xml",
-    src: "android.hardware.usb.gadget-service.rpi.xml",
-    sub_dir: "vintf",
-    installable: false,
-}
-
-apex {
-    name: "com.android.hardware.usb.gadget.rpi5",
-    manifest: "apex_manifest.json",
-    file_contexts: "apex_file_contexts",
-    key: "com.android.hardware.key",
-    certificate: ":com.android.hardware.certificate",
-    updatable: false,
-    vendor: true,
-
-    binaries: ["android.hardware.usb.gadget-service.rpi"],
-    prebuilts: [
-        "android.hardware.usb.gadget-service.rpi.rc",
-        "android.hardware.usb.gadget-service.rpi.xml",
-    ],
+    static_libs: ["libusbconfigfs-rpi"],
 }

usb/android.hardware.usb.gadget-service.rpi.rc

@@ -1,4 +1,4 @@
-service vendor.usb_gadget-rpi /apex/com.android.hardware.usb.gadget.rpi5/bin/hw/android.hardware.usb.gadget-service.rpi
+service vendor.usb_gadget-default /vendor/bin/hw/android.hardware.usb.gadget-service.rpi
     class hal
     user system
     group system shell mtp

usb/apex_file_contexts

@@ -1,3 +0,0 @@
-(/.*)?                                               u:object_r:vendor_file:s0
-/etc(/.*)?                                           u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.usb\.gadget-service\.rpi  u:object_r:hal_usb_gadget_default_exec:s0

usb/apex_manifest.json

@@ -1,4 +0,0 @@
-{
-    "name": "com.android.hardware.usb.gadget.rpi5",
-    "version": 1
-}

usb/lib/Android.bp

@@ -0,0 +1,28 @@
+// Copyright (C) 2020 The Android Open Source Project
+// Copyright (C) 2024 KonstaKANG
+//
+// SPDX-License-Identifier: Apache-2.0
+
+cc_library_static {
+    name: "libusbconfigfs-rpi",
+    vendor_available: true,
+    export_include_dirs: ["include"],
+
+    srcs: [
+        "UsbGadgetUtils.cpp",
+        "MonitorFfs.cpp",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+
+    shared_libs: [
+        "android.hardware.usb.gadget-V1-ndk",
+        "libbase",
+        "libcutils",
+        "libhidlbase",
+        "libutils",
+    ],
+}

usb/lib/MonitorFfs.cpp

@@ -17,7 +17,7 @@
 
 #define LOG_TAG "libusbconfigfs"
 
-#include "UsbGadgetCommon.h"
+#include "include/UsbGadgetCommon.h"
 
 namespace aidl {
 namespace android {

usb/lib/UsbGadgetUtils.cpp

@@ -17,7 +17,7 @@
 
 #define LOG_TAG "libusbconfigfs"
 
-#include "UsbGadgetCommon.h"
+#include "include/UsbGadgetCommon.h"
 
 namespace aidl {
 namespace android {

usb/service.cpp

@@ -15,22 +15,19 @@
  * limitations under the License.
  */
 
-#include "UsbGadget.h"
-
 #include <android-base/logging.h>
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
+#include "UsbGadget.h"
 
 using ::aidl::android::hardware::usb::gadget::UsbGadget;
 
 int main() {
     ABinderProcess_setThreadPoolMaxThreadCount(0);
     std::shared_ptr<UsbGadget> usbgadget = ndk::SharedRefBase::make<UsbGadget>();
-
     const std::string instance = std::string() + UsbGadget::descriptor + "/default";
     binder_status_t status = AServiceManager_addService(usbgadget->asBinder().get(), instance.c_str());
     CHECK(status == STATUS_OK);
-
     ABinderProcess_joinThreadPool();
-    return EXIT_FAILURE;  // should not reach
+    return -1;
 }