tangorpro: Initialize for Evolution X 9.x

Signed-off-by: AnierinB <anierin@evolution-x.org>

BoardConfigEvolution.mk

@@ -1,4 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
-# SPDX-License-Identifier: Apache-2.0
-#

BoardConfigLineage.mk

@@ -1,11 +1,5 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
-
-# Kernel modules
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_kernel_boot
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_kernel_boot))
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)))

OWNERS

@@ -1,4 +1,4 @@
 per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com
 
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS

USI_Stylus.idc

@@ -1,4 +0,0 @@
-touch.orientationAware = 1
-touch.orientation = ORIENTATION_0
-touch.usiVersionMajor = 2
-touch.usiVersionMinor = 0

audio/tangorpro/aidl_config/mixer_paths_aidl.xml

@@ -1410,7 +1410,7 @@
     <path name="bluetooth-sco-headset-microphones" />
   </path>
 
-  <path name="usb-microphones">
+  <path name="usb-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@@ -1420,14 +1420,6 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="usb-headset-microphones">
-    <path name="usb-microphones" />
-  </path>
-
-  <path name="usb-device-microphones">
-    <path name="usb-microphones" />
-  </path>
-
   <!-- cs35l41 specific path for rotation start -->
   <path name="cs35l41-rotation-0">
   </path>

audio/tangorpro/config/audio_platform_configuration.xml

@@ -254,7 +254,6 @@
         <feature name="SoundTriggerDockTuning"/>
         <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:WholeSpeaker"/>
         <feature name="Apmg3"/>
-        <!--feature name="Pokebowl"/-->
     </features>
 
     <cfg_attr>
@@ -293,7 +292,6 @@
         <item component="TUNING_COMPONENT_WAVES" id="2"/>
         <item component="TUNING_COMPONENT_FORTEMEDIA" id="3"/>
         <item component="TUNING_COMPONENT_APMG3" id="24"/>
-        <!--item component="TUNING_COMPONENT_POKEBOWL" id="25"/-->
         <item component="TUNING_COMPONENT_CAMCORDER" id="6"/>
         <item component="TUNING_COMPONENT_STEREO_SPATIALIZER" id="26"/>
     </xlate_id>
@@ -314,7 +312,6 @@
         <module libname="audio_amcs_ext.so" argu="SpeakerNum=4" />
         <module libname="audio_bluenote_aoc.so"/>
         <module libname="audio_apmg3_aoc.so"/>
-        <!--module libname="audio_pokebowl_aoc.so"/-->
     </external_module>
 
     <hal_effect>

audio/tangorpro/config/audio_policy_configuration.xml

@@ -136,6 +136,10 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
+                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -148,6 +152,8 @@
                 </devicePort>
                 <devicePort tagName="USB Dock" type="AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET" role="sink">
                 </devicePort>
+                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -155,6 +161,8 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
+                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
@@ -187,7 +195,7 @@
                 <route type="mix" sink="Speaker"
                        sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output,immersive_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output,immersive_out"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
                 <route type="mix" sink="BT A2DP Out"
                        sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out,immersive_out"/>
                 <route type="mix" sink="BT A2DP Headphones"

audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml

@@ -136,6 +136,10 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
+                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -148,6 +152,8 @@
                 </devicePort>
                 <devicePort tagName="USB Dock" type="AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET" role="sink">
                 </devicePort>
+                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -155,6 +161,8 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
+                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml

@@ -132,6 +132,10 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
+                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -142,6 +146,8 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
+                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -149,6 +155,8 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
+                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

bluetooth/syna_default.mk

@@ -60,7 +60,9 @@ PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.synabtlinux \
         android.hardware.bluetooth_le.prebuilt.xml
 
 # Bluetooth SAR test tools
-PRODUCT_PACKAGES_ENG += bt_sar_test
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += bt_sar_test
+endif
 
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \

cast_auth/mediadrm/Android.bp

@@ -0,0 +1,48 @@
+
+// ----------------------------------------------------------------------------
+// Builds android.hardware.drm-service.castkey
+//
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_google_tangorpro_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["device_google_tangorpro_license"],
+}
+
+cc_binary {
+    name: "android.hardware.drm-service.castkey",
+    defaults: ["castkey_service_defaults"],
+    srcs: ["Service.cpp"],
+    init_rc: ["android.hardware.drm-service.castkey.rc"],
+    vintf_fragments: ["manifest_android.hardware.drm-service.castkey.xml"],
+}
+
+cc_defaults {
+    name: "castkey_service_defaults",
+    vendor: true,
+    proprietary: true,
+    srcs: [
+        "CreatePluginFactories.cpp",
+        "DrmFactory.cpp",
+        "DrmPlugin.cpp",
+        "SessionLibrary.cpp",
+    ],
+
+    relative_install_path: "hw",
+
+    cflags: ["-Wall", "-Werror"],
+
+    include_dirs: [
+        "device/google/tangorpro/cast_auth/mediadrm/include",
+    ],
+
+    shared_libs: [
+        "android.hardware.drm-V1-ndk",
+        "libbase",
+        "libbinder_ndk",
+        "liblog",
+        "libutils",
+    ],
+}

cast_auth/mediadrm/CreatePluginFactories.cpp

@@ -0,0 +1,17 @@
+#include "CreatePluginFactories.h"
+
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace drm {
+namespace castkey {
+
+std::shared_ptr<DrmFactory> createDrmFactory() {
+    return ::ndk::SharedRefBase::make<DrmFactory>();
+}
+
+}  // namespace castkey
+}  // namespace drm
+}  // namespace hardware
+}  // namespace android
+}  // namespace aidl

cast_auth/mediadrm/DrmFactory.cpp

@@ -0,0 +1,82 @@
+#define LOG_TAG "castkey-DrmFactory"
+
+#include <utils/Log.h>
+
+#include "DrmFactory.h"
+
+#include "DrmPlugin.h"
+#include "Utils.h"
+
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace drm {
+namespace castkey {
+
+namespace {
+
+const std::array<uint8_t, 16> kCastKeyUUID{
+    0xBC, 0xB4, 0x81, 0xCB, 0xA1, 0xD5, 0x42, 0xAF,
+    0xB1, 0xE3, 0x7B, 0xFF, 0x14, 0x73, 0xEB, 0x85
+};
+
+bool isCastKeyUUID(const uint8_t uuid[16]) {
+    return !memcmp(uuid, kCastKeyUUID.data(), 16);
+}
+
+}
+
+using std::string;
+using std::vector;
+
+using ::aidl::android::hardware::drm::Status;
+using ::aidl::android::hardware::drm::Uuid;
+using namespace castkeydrm;
+
+::ndk::ScopedAStatus DrmFactory::createDrmPlugin(
+        const Uuid& in_uuid, const string& in_appPackageName,
+        std::shared_ptr<::aidl::android::hardware::drm::IDrmPlugin>* _aidl_return) {
+    UNUSED(in_appPackageName);
+    if (!isCastKeyUUID(in_uuid.uuid.data())) {
+        ALOGE("Castkey Drm HAL: failed to create drm plugin, "
+              "invalid crypto scheme");
+        *_aidl_return = nullptr;
+        return toNdkScopedAStatus(Status::BAD_VALUE);
+    }
+    std::shared_ptr<DrmPlugin> plugin =
+            ::ndk::SharedRefBase::make<DrmPlugin>();
+    *_aidl_return = plugin;
+    return toNdkScopedAStatus(Status::OK);
+}
+
+::ndk::ScopedAStatus DrmFactory::createCryptoPlugin(
+        const Uuid& in_uuid, const std::vector<uint8_t>& in_initData,
+        std::shared_ptr<::aidl::android::hardware::drm::ICryptoPlugin>* _aidl_return) {
+    UNUSED(in_uuid);
+    UNUSED(in_initData);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmFactory::getSupportedCryptoSchemes(CryptoSchemes* _aidl_return) {
+    CryptoSchemes schemes{};
+    schemes.uuids.push_back({kCastKeyUUID});
+    *_aidl_return = schemes;
+    return toNdkScopedAStatus(Status::OK);
+}
+
+binder_status_t DrmFactory::dump(int fd, const char** args, uint32_t numArgs) {
+    UNUSED(args);
+    UNUSED(numArgs);
+    if (fd < 0) {
+        ALOGE("%s: negative fd", __FUNCTION__);
+        return STATUS_BAD_VALUE;
+    }
+    return STATUS_OK;
+}
+
+}  // namespace castkey
+}  // namespace drm
+}  // namespace hardware
+}  // namespace android
+}  // namespace aidl

cast_auth/mediadrm/DrmPlugin.cpp

@@ -0,0 +1,419 @@
+#define LOG_TAG "castkey-DrmPlugin"
+
+#include <utils/Log.h>
+#include <dlfcn.h>
+#include <fstream>
+#include <vector>
+#include <stdlib.h>
+
+#include "Utils.h"
+#include "DrmPlugin.h"
+#include "SessionLibrary.h"
+
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace drm {
+namespace castkey {
+
+using namespace castkeydrm;
+
+DrmPlugin::DrmPlugin() {};
+DrmPlugin::~DrmPlugin() {};
+
+constexpr char CAST_CRT_FILE[] = "/mnt/vendor/persist/nest/cast_auth.crt";
+constexpr char CAST_ICA_FILE[] = "/vendor/etc/cert-chain.crt";
+constexpr unsigned char kSha1Prefix[] = {0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e,
+                            0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14};
+constexpr unsigned char kSha256Prefix[] = {0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60,
+                              0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
+                              0x01, 0x05, 0x00, 0x04, 0x20};
+constexpr int kSHA1Length = 20;
+constexpr int kSHA256Length = 32;
+constexpr int DigestInfoPrefixesSize = 2;
+
+struct DigestInfoPrefix {
+    const unsigned char* bytes;
+    size_t size;
+    size_t hash_size;
+};
+
+// Array of DigestInfoPrefixes that are currently supported (SHA1 and SHA256).
+const DigestInfoPrefix kDigestInfoPrefixes[] = {
+    {kSha1Prefix, sizeof(kSha1Prefix), kSHA1Length},
+    {kSha256Prefix, sizeof(kSha256Prefix), kSHA256Length},
+};
+
+// If we find a raw hash, prepend the appropriate DER prefix.
+std::vector<uint8_t> adjustHash(const std::vector<uint8_t>& hash) {
+    std::vector<uint8_t> adjusted_hash(hash);
+    for (size_t i = 0; i < DigestInfoPrefixesSize; i++) {
+        const DigestInfoPrefix& prefix = kDigestInfoPrefixes[i];
+        if (hash.size() == prefix.hash_size) {
+            adjusted_hash.insert(adjusted_hash.begin(), prefix.bytes,
+                       &prefix.bytes[prefix.size]);
+            break;
+    }
+  }
+  return adjusted_hash;
+}
+
+std::vector<uint8_t> readBinaryFile(const std::string& file_path) {
+    std::ifstream fin(file_path, std::ios::in | std::ios::binary);
+    fin >> std::noskipws;
+    std::vector<uint8_t> buffer((std::istream_iterator<uint8_t>(fin)),
+                                std::istream_iterator<uint8_t>());
+    return buffer;
+}
+
+::ndk::ScopedAStatus DrmPlugin::openSession(
+        ::aidl::android::hardware::drm::SecurityLevel in_securityLevel,
+        std::vector<uint8_t>* _aidl_return) {
+    UNUSED(in_securityLevel);
+    std::vector<uint8_t> sessionId = SessionLibrary::get()->createSession();
+    *_aidl_return = sessionId;
+    return toNdkScopedAStatus(Status::OK);
+}
+
+::ndk::ScopedAStatus DrmPlugin::closeSession(const std::vector<uint8_t>& in_sessionId) {
+    if (in_sessionId.size() == 0) {
+        return toNdkScopedAStatus(Status::BAD_VALUE);
+    }
+    SessionLibrary::get()->closeSession(in_sessionId);
+    return toNdkScopedAStatus(Status::OK);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getPropertyByteArray(const std::string& in_propertyName,
+                                                     std::vector<uint8_t>* _aidl_return) {
+    Status status = Status::OK;
+    std::string name(in_propertyName.c_str());
+    std::vector<uint8_t> value;
+    if (name == "castcert") {
+        std::vector<uint8_t> device_cert = readBinaryFile(CAST_CRT_FILE);
+        std::vector<uint8_t> ica = readBinaryFile(CAST_ICA_FILE);
+        value = std::move(device_cert);
+        value.insert(value.end(), ica.begin(), ica.end());
+    } else {
+        status = Status::ERROR_DRM_CANNOT_HANDLE;
+        ALOGE("Unsupported Property: %s", in_propertyName.c_str());
+    }
+    *_aidl_return = value;
+    return toNdkScopedAStatus(status);
+}
+
+::ndk::ScopedAStatus DrmPlugin::signRSA(const std::vector<uint8_t>& in_sessionId,
+                                          const std::string& in_algorithm,
+                                          const std::vector<uint8_t>& in_message,
+                                          const std::vector<uint8_t>& in_wrappedkey,
+                                          std::vector<uint8_t>* _aidl_return) {
+    if (in_sessionId.size() == 0 || in_message.size() == 0) {
+        return toNdkScopedAStatus(Status::BAD_VALUE);
+    }
+    UNUSED(in_algorithm);
+    UNUSED(in_wrappedkey);
+    Status status = Status::ERROR_DRM_CANNOT_HANDLE;
+    std::vector<uint8_t> signature;
+    *_aidl_return = std::vector<uint8_t>();
+    void* cast_auth_handle = ::dlopen("libcast_auth.so", RTLD_LAZY);
+    if (!cast_auth_handle) {
+        ALOGE("Fail to get TA for signing");
+        return toNdkScopedAStatus(status);
+    }
+    typedef bool (*func_type)(const std::vector<uint8_t>&,
+                              std::vector<uint8_t>*);
+    func_type sign_hash_func =
+        reinterpret_cast<func_type>(::dlsym(cast_auth_handle, "SignHash"));
+    if (!sign_hash_func) {
+        ALOGE("Fail to apply signing method");
+        dlclose(cast_auth_handle);
+        return toNdkScopedAStatus(status);
+    }
+    const std::vector<uint8_t> msg = adjustHash(in_message);
+    int res = sign_hash_func(msg, &signature);
+    dlclose(cast_auth_handle);
+    if (res == 0) {
+        *_aidl_return = signature;
+        return toNdkScopedAStatus(Status::OK);
+    }
+    ALOGE("Get empty result from TA");
+    return toNdkScopedAStatus(status);
+}
+
+::ndk::ScopedAStatus DrmPlugin::decrypt(const std::vector<uint8_t>& in_sessionId,
+                             const std::vector<uint8_t>& in_keyId,
+                             const std::vector<uint8_t>& in_input,
+                             const std::vector<uint8_t>& in_iv,
+                             std::vector<uint8_t>* _aidl_return) {
+    UNUSED(in_sessionId);
+    UNUSED(in_keyId);
+    UNUSED(in_input);
+    UNUSED(in_iv);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::encrypt(const std::vector<uint8_t>& in_sessionId,
+                             const std::vector<uint8_t>& in_keyId,
+                             const std::vector<uint8_t>& in_input,
+                             const std::vector<uint8_t>& in_iv,
+                             std::vector<uint8_t>* _aidl_return) {
+    UNUSED(in_sessionId);
+    UNUSED(in_keyId);
+    UNUSED(in_input);
+    UNUSED(in_iv);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getHdcpLevels(
+    ::aidl::android::hardware::drm::HdcpLevels* _aidl_return) {
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getKeyRequest(
+    const std::vector<uint8_t>& in_scope,
+    const std::vector<uint8_t>& in_initData,
+    const std::string& in_mimeType,
+    ::aidl::android::hardware::drm::KeyType in_keyType,
+    const std::vector<::aidl::android::hardware::drm::KeyValue>& in_optionalParameters,
+    ::aidl::android::hardware::drm::KeyRequest* _aidl_return) {
+    UNUSED(in_scope);
+    UNUSED(in_initData);
+    UNUSED(in_mimeType);
+    UNUSED(in_keyType);
+    UNUSED(in_optionalParameters);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getLogMessages(
+    std::vector<::aidl::android::hardware::drm::LogMessage>* _aidl_return) {
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getMetrics(
+    std::vector<::aidl::android::hardware::drm::DrmMetricGroup>* _aidl_return) {
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getNumberOfSessions(
+    ::aidl::android::hardware::drm::NumberOfSessions* _aidl_return) {
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getOfflineLicenseKeySetIds(
+    std::vector<::aidl::android::hardware::drm::KeySetId>* _aidl_return) {
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getOfflineLicenseState(
+    const ::aidl::android::hardware::drm::KeySetId& in_keySetId,
+    ::aidl::android::hardware::drm::OfflineLicenseState* _aidl_return) {
+    UNUSED(in_keySetId);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getPropertyString(const std::string& in_propertyName,
+                                       std::string* _aidl_return) {
+    UNUSED(in_propertyName);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getProvisionRequest(
+    const std::string& in_certificateType,
+    const std::string& in_certificateAuthority,
+    ::aidl::android::hardware::drm::ProvisionRequest* _aidl_return) {
+    UNUSED(in_certificateType);
+    UNUSED(in_certificateAuthority);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getSecureStop(
+    const ::aidl::android::hardware::drm::SecureStopId& in_secureStopId,
+    ::aidl::android::hardware::drm::SecureStop* _aidl_return) {
+    UNUSED(in_secureStopId);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getSecureStopIds(
+    std::vector<::aidl::android::hardware::drm::SecureStopId>* _aidl_return) {
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getSecureStops(
+    std::vector<::aidl::android::hardware::drm::SecureStop>* _aidl_return) {
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::getSecurityLevel(
+    const std::vector<uint8_t>& in_sessionId,
+    ::aidl::android::hardware::drm::SecurityLevel* _aidl_return) {
+    UNUSED(in_sessionId);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::provideKeyResponse(
+    const std::vector<uint8_t>& in_scope,
+    const std::vector<uint8_t>& in_response,
+    ::aidl::android::hardware::drm::KeySetId* _aidl_return) {
+    UNUSED(in_scope);
+    UNUSED(in_response);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::provideProvisionResponse(
+    const std::vector<uint8_t>& in_response,
+    ::aidl::android::hardware::drm::ProvideProvisionResponseResult* _aidl_return) {
+    UNUSED(in_response);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::queryKeyStatus(
+    const std::vector<uint8_t>& in_sessionId,
+    std::vector<::aidl::android::hardware::drm::KeyValue>* _aidl_return) {
+    UNUSED(in_sessionId);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::releaseAllSecureStops() {
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::releaseSecureStop(
+    const ::aidl::android::hardware::drm::SecureStopId& in_secureStopId) {
+    UNUSED(in_secureStopId);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::releaseSecureStops(
+    const ::aidl::android::hardware::drm::OpaqueData& in_ssRelease) {
+    UNUSED(in_ssRelease);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::removeAllSecureStops() {
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::removeKeys(const std::vector<uint8_t>& in_sessionId) {
+    UNUSED(in_sessionId);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::removeOfflineLicense(
+    const ::aidl::android::hardware::drm::KeySetId& in_keySetId) {
+    UNUSED(in_keySetId);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::removeSecureStop(
+    const ::aidl::android::hardware::drm::SecureStopId& in_secureStopId) {
+    UNUSED(in_secureStopId);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::requiresSecureDecoder(
+    const std::string& in_mime,
+    ::aidl::android::hardware::drm::SecurityLevel in_level,
+    bool* _aidl_return) {
+    UNUSED(in_mime);
+    UNUSED(in_level);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::restoreKeys(
+    const std::vector<uint8_t>& in_sessionId,
+    const ::aidl::android::hardware::drm::KeySetId& in_keySetId) {
+    UNUSED(in_sessionId);
+    UNUSED(in_keySetId);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::setCipherAlgorithm(const std::vector<uint8_t>& in_sessionId,
+                                        const std::string& in_algorithm) {
+    UNUSED(in_sessionId);
+    UNUSED(in_algorithm);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::setListener(
+     const std::shared_ptr<::aidl::android::hardware::drm::IDrmPluginListener>&
+         in_listener) {
+    UNUSED(in_listener);
+    return toNdkScopedAStatus(Status::OK);
+}
+
+::ndk::ScopedAStatus DrmPlugin::setMacAlgorithm(const std::vector<uint8_t>& in_sessionId,
+                                     const std::string& in_algorithm) {
+    UNUSED(in_sessionId);
+    UNUSED(in_algorithm);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::setPlaybackId(const std::vector<uint8_t>& in_sessionId,
+                                   const std::string& in_playbackId) {
+    UNUSED(in_sessionId);
+    UNUSED(in_playbackId);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::setPropertyByteArray(const std::string& in_propertyName,
+                                          const std::vector<uint8_t>& in_value) {
+    UNUSED(in_propertyName);
+    UNUSED(in_value);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::setPropertyString(const std::string& in_propertyName,
+                                       const std::string& in_value) {
+    UNUSED(in_propertyName);
+    UNUSED(in_value);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::sign(const std::vector<uint8_t>& in_sessionId,
+                          const std::vector<uint8_t>& in_keyId,
+                          const std::vector<uint8_t>& in_message,
+                          std::vector<uint8_t>* _aidl_return) {
+    UNUSED(in_sessionId);
+    UNUSED(in_keyId);
+    UNUSED(in_message);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+::ndk::ScopedAStatus DrmPlugin::verify(const std::vector<uint8_t>& in_sessionId,
+                            const std::vector<uint8_t>& in_keyId,
+                            const std::vector<uint8_t>& in_message,
+                            const std::vector<uint8_t>& in_signature,
+                            bool* _aidl_return) {
+    UNUSED(in_sessionId);
+    UNUSED(in_keyId);
+    UNUSED(in_message);
+    UNUSED(in_signature);
+    UNUSED(_aidl_return);
+    return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
+}
+
+
+}  // namespace castkey
+}  // namespace drm
+}  // namespace hardware
+}  // namespace android
+}  // namespace aidl

cast_auth/mediadrm/Service.cpp

@@ -0,0 +1,23 @@
+#define LOG_TAG "castkey-main"
+
+#include <android-base/logging.h>
+#include <android/binder_manager.h>
+#include <android/binder_process.h>
+#include "CreatePluginFactories.h"
+
+using ::android::base::InitLogging;
+using ::android::base::LogdLogger;
+using ::aidl::android::hardware::drm::castkey::createDrmFactory;
+using ::aidl::android::hardware::drm::castkey::DrmFactory;
+
+int main(int /*argc*/, char* argv[]) {
+    InitLogging(argv, LogdLogger());
+    ABinderProcess_setThreadPoolMaxThreadCount(8);
+    std::shared_ptr<DrmFactory> drmFactory = createDrmFactory();
+    const std::string drmInstance = std::string() + DrmFactory::descriptor + "/castkey";
+    binder_status_t status =
+            AServiceManager_addService(drmFactory->asBinder().get(), drmInstance.c_str());
+    CHECK(status == STATUS_OK);
+    ABinderProcess_joinThreadPool();
+    return EXIT_FAILURE;
+}

cast_auth/mediadrm/SessionLibrary.cpp

@@ -0,0 +1,39 @@
+#include "SessionLibrary.h"
+
+#include <algorithm>
+#include <string>
+
+namespace castkeydrm {
+
+std::mutex SessionLibrary::singleton_lock_;
+SessionLibrary* SessionLibrary::singleton_ = NULL;
+
+SessionLibrary* SessionLibrary::get() {
+    std::lock_guard<std::mutex> guard(singleton_lock_);
+
+    if (singleton_ == NULL) {
+        singleton_ = new SessionLibrary();
+    }
+
+    return singleton_;
+}
+
+std::vector<uint8_t> SessionLibrary::createSession() {
+    std::lock_guard<std::mutex> guard(session_lock_);
+
+    std::string session_string = std::to_string(next_session_id_);
+    next_session_id_ += 1;
+    sessions_.emplace_back(session_string.begin(), session_string.end());
+    return sessions_.back();
+}
+
+void SessionLibrary::closeSession(const std::vector<uint8_t>& session) {
+    std::lock_guard<std::mutex> guard(session_lock_);
+    sessions_.erase(std::remove_if(sessions_.begin(), sessions_.end(),
+                                   [&session](const std::vector<uint8_t>& e) {
+                                     return std::equal(e.begin(), e.end(), session.begin());
+                                   }),
+                    sessions_.end());
+}
+
+} // namespace castkeydrm

cast_auth/mediadrm/android.hardware.drm-service.castkey.rc

@@ -0,0 +1,6 @@
+service vendor.drm-castkey-service /vendor/bin/hw/android.hardware.drm-service.castkey
+    class hal
+    user media
+    group mediadrm drmrpc
+    ioprio rt 4
+    interface aidl android.hardware.drm.IDrmFactory/castkey

cast_auth/mediadrm/include/CastKeyTypes.h

@@ -0,0 +1,48 @@
+#ifndef CASTKEY_TYPES_H_
+#define CASTKEY_TYPES_H_
+
+#include <cstdint>
+#include <map>
+#include <vector>
+
+namespace castkeydrm {
+
+const uint8_t kBlockSize = 16;  // AES_BLOCK_SIZE;
+typedef uint8_t KeyId[kBlockSize];
+typedef uint8_t Iv[kBlockSize];
+
+typedef std::map<std::vector<uint8_t>, std::vector<uint8_t>> KeyMap;
+
+#define CASTKEY_DISALLOW_COPY_AND_ASSIGN(TypeName)          \
+    TypeName(const TypeName&) = delete;                     \
+    void operator=(const TypeName&) = delete;
+
+#define CASTKEY_DISALLOW_COPY_AND_ASSIGN_AND_NEW(TypeName)  \
+    TypeName() = delete;                                    \
+    TypeName(const TypeName&) = delete;                     \
+    void operator=(const TypeName&) = delete;
+
+enum CdmResponseType : int32_t {
+    OK = 0,
+    ERROR_NO_LICENSE = 1,
+    ERROR_SESSION_NOT_OPENED = 3,
+    ERROR_CANNOT_HANDLE = 4,
+    ERROR_INVALID_STATE = 5,
+    BAD_VALUE = 6,
+    ERROR_DECRYPT = 11,
+    ERROR_UNKNOWN = 12,
+    ERROR_INSUFFICIENT_SECURITY = 13,
+    ERROR_FRAME_TOO_LARGE = 14,
+    ERROR_SESSION_LOST_STATE = 15,
+    ERROR_RESOURCE_CONTENTION = 16,
+};
+
+enum CdmKeyType : int32_t {
+    KEY_TYPE_OFFLINE = 0,
+    KEY_TYPE_STREAMING = 1,
+    KEY_TYPE_RELEASE = 2,
+};
+
+}  // namespace castkeydrm
+
+#endif  // CASTKEY_TYPES_H_

cast_auth/mediadrm/include/CreatePluginFactories.h

@@ -0,0 +1,20 @@
+#ifndef CREATE_PLUGIN_FACTORIES_H_
+#define CREATE_PLUGIN_FACTORIES_H_
+
+#include "DrmFactory.h"
+
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace drm {
+namespace castkey {
+
+std::shared_ptr<DrmFactory> createDrmFactory();
+
+}  // namespace castkey
+}  // namespace drm
+}  // namespace hardware
+}  // namespace android
+}  // namespace aidl
+
+#endif  // CREATE_PLUGIN_FACTORIES_H_

cast_auth/mediadrm/include/DrmFactory.h

@@ -0,0 +1,50 @@
+#ifndef DRM_FACTORY_H_
+#define DRM_FACTORY_H_
+
+#include <aidl/android/hardware/drm/BnDrmFactory.h>
+#include <aidl/android/hardware/drm/IDrmFactory.h>
+#include <aidl/android/hardware/drm/IDrmPlugin.h>
+#include <aidl/android/hardware/drm/ICryptoPlugin.h>
+
+#include <string>
+#include <vector>
+
+#include "CastKeyTypes.h"
+
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace drm {
+namespace castkey {
+
+struct DrmFactory : public BnDrmFactory {
+    DrmFactory() {};
+    virtual ~DrmFactory() {};
+
+    ::ndk::ScopedAStatus createDrmPlugin(
+            const ::aidl::android::hardware::drm::Uuid& in_uuid,
+            const std::string& in_appPackageName,
+            std::shared_ptr<::aidl::android::hardware::drm::IDrmPlugin>* _aidl_return) override;
+
+    ::ndk::ScopedAStatus createCryptoPlugin(
+            const ::aidl::android::hardware::drm::Uuid& in_uuid,
+            const std::vector<uint8_t>& in_initData,
+            std::shared_ptr<::aidl::android::hardware::drm::ICryptoPlugin>* _aidl_return) override;
+
+    ::ndk::ScopedAStatus getSupportedCryptoSchemes(
+            ::aidl::android::hardware::drm::CryptoSchemes* _aidl_return) override;
+
+    binder_status_t dump(int fd, const char** args, uint32_t numArgs) override;
+
+
+  private:
+    CASTKEY_DISALLOW_COPY_AND_ASSIGN(DrmFactory);
+};
+
+}  // namespace castkey
+}  // namespace drm
+}  // namespace hardware
+}  // namespace android
+}  // namespace aidl
+
+#endif  // DRM_FACTORIES_H_

cast_auth/mediadrm/include/DrmPlugin.h

@@ -0,0 +1,143 @@
+#ifndef DRM_PLUGIN_H_
+#define DRM_PLUGIN_H_
+
+#include <aidl/android/hardware/drm/BnDrmPlugin.h>
+#include <aidl/android/hardware/drm/IDrmPluginListener.h>
+#include <aidl/android/hardware/drm/Status.h>
+
+#include <stdio.h>
+#include <map>
+
+#include <utils/List.h>
+
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace drm {
+namespace castkey {
+
+using namespace castkeydrm;
+using ::aidl::android::hardware::drm::KeyType;
+using ::aidl::android::hardware::drm::Status;
+
+struct DrmPlugin : public BnDrmPlugin {
+public:
+    explicit DrmPlugin();
+    virtual ~DrmPlugin();
+
+    ::ndk::ScopedAStatus closeSession(const std::vector<uint8_t>& in_sessionId) override;
+    ::ndk::ScopedAStatus decrypt(const std::vector<uint8_t>& in_sessionId,
+                                 const std::vector<uint8_t>& in_keyId,
+                                 const std::vector<uint8_t>& in_input,
+                                 const std::vector<uint8_t>& in_iv,
+                                 std::vector<uint8_t>* _aidl_return) override;
+    ::ndk::ScopedAStatus encrypt(const std::vector<uint8_t>& in_sessionId,
+                                 const std::vector<uint8_t>& in_keyId,
+                                 const std::vector<uint8_t>& in_input,
+                                 const std::vector<uint8_t>& in_iv,
+                                 std::vector<uint8_t>* _aidl_return) override;
+    ::ndk::ScopedAStatus getHdcpLevels(
+        ::aidl::android::hardware::drm::HdcpLevels* _aidl_return) override;
+    ::ndk::ScopedAStatus getKeyRequest(
+        const std::vector<uint8_t>& in_scope,
+        const std::vector<uint8_t>& in_initData,
+        const std::string& in_mimeType,
+        ::aidl::android::hardware::drm::KeyType in_keyType,
+        const std::vector<::aidl::android::hardware::drm::KeyValue>& in_optionalParameters,
+        ::aidl::android::hardware::drm::KeyRequest* _aidl_return) override;
+    ::ndk::ScopedAStatus getLogMessages(
+        std::vector<::aidl::android::hardware::drm::LogMessage>* _aidl_return) override;
+
+    ::ndk::ScopedAStatus getMetrics(
+        std::vector<::aidl::android::hardware::drm::DrmMetricGroup>* _aidl_return) override;
+    ::ndk::ScopedAStatus getNumberOfSessions(
+        ::aidl::android::hardware::drm::NumberOfSessions* _aidl_return) override;
+    ::ndk::ScopedAStatus getOfflineLicenseKeySetIds(
+        std::vector<::aidl::android::hardware::drm::KeySetId>* _aidl_return) override;
+    ::ndk::ScopedAStatus getOfflineLicenseState(
+        const ::aidl::android::hardware::drm::KeySetId& in_keySetId,
+        ::aidl::android::hardware::drm::OfflineLicenseState* _aidl_return) override;
+    ::ndk::ScopedAStatus getPropertyByteArray(const std::string& in_propertyName,
+                                              std::vector<uint8_t>* _aidl_return) override;
+    ::ndk::ScopedAStatus getPropertyString(const std::string& in_propertyName,
+                                           std::string* _aidl_return) override;
+    ::ndk::ScopedAStatus getProvisionRequest(
+        const std::string& in_certificateType,
+        const std::string& in_certificateAuthority,
+        ::aidl::android::hardware::drm::ProvisionRequest* _aidl_return) override;
+    ::ndk::ScopedAStatus getSecureStop(
+        const ::aidl::android::hardware::drm::SecureStopId& in_secureStopId,
+        ::aidl::android::hardware::drm::SecureStop* _aidl_return) override;
+    ::ndk::ScopedAStatus getSecureStopIds(
+        std::vector<::aidl::android::hardware::drm::SecureStopId>* _aidl_return) override;
+    ::ndk::ScopedAStatus getSecureStops(
+        std::vector<::aidl::android::hardware::drm::SecureStop>* _aidl_return) override;
+    ::ndk::ScopedAStatus getSecurityLevel(
+        const std::vector<uint8_t>& in_sessionId,
+        ::aidl::android::hardware::drm::SecurityLevel* _aidl_return) override;
+    ::ndk::ScopedAStatus openSession(::aidl::android::hardware::drm::SecurityLevel in_securityLevel,
+                                     std::vector<uint8_t>* _aidl_return) override;
+    ::ndk::ScopedAStatus provideKeyResponse(
+        const std::vector<uint8_t>& in_scope,
+        const std::vector<uint8_t>& in_response,
+        ::aidl::android::hardware::drm::KeySetId* _aidl_return) override;
+    ::ndk::ScopedAStatus provideProvisionResponse(
+        const std::vector<uint8_t>& in_response,
+        ::aidl::android::hardware::drm::ProvideProvisionResponseResult* _aidl_return) override;
+    ::ndk::ScopedAStatus queryKeyStatus(
+        const std::vector<uint8_t>& in_sessionId,
+        std::vector<::aidl::android::hardware::drm::KeyValue>* _aidl_return) override;
+    ::ndk::ScopedAStatus releaseAllSecureStops() override;
+    ::ndk::ScopedAStatus releaseSecureStop(
+        const ::aidl::android::hardware::drm::SecureStopId& in_secureStopId) override;
+    ::ndk::ScopedAStatus releaseSecureStops(
+        const ::aidl::android::hardware::drm::OpaqueData& in_ssRelease) override;
+    ::ndk::ScopedAStatus removeAllSecureStops() override;
+    ::ndk::ScopedAStatus removeKeys(const std::vector<uint8_t>& in_sessionId) override;
+    ::ndk::ScopedAStatus removeOfflineLicense(
+        const ::aidl::android::hardware::drm::KeySetId& in_keySetId) override;
+    ::ndk::ScopedAStatus removeSecureStop(
+        const ::aidl::android::hardware::drm::SecureStopId& in_secureStopId) override;
+    ::ndk::ScopedAStatus requiresSecureDecoder(
+        const std::string& in_mime,
+        ::aidl::android::hardware::drm::SecurityLevel in_level,
+        bool* _aidl_return) override;
+    ::ndk::ScopedAStatus restoreKeys(
+        const std::vector<uint8_t>& in_sessionId,
+        const ::aidl::android::hardware::drm::KeySetId& in_keySetId) override;
+    ::ndk::ScopedAStatus setCipherAlgorithm(const std::vector<uint8_t>& in_sessionId,
+                                            const std::string& in_algorithm) override;
+    ::ndk::ScopedAStatus setListener(
+       const std::shared_ptr<::aidl::android::hardware::drm::IDrmPluginListener>&
+           in_listener) override;
+    ::ndk::ScopedAStatus setMacAlgorithm(const std::vector<uint8_t>& in_sessionId,
+                                         const std::string& in_algorithm) override;
+    ::ndk::ScopedAStatus setPlaybackId(const std::vector<uint8_t>& in_sessionId,
+                                       const std::string& in_playbackId) override;
+    ::ndk::ScopedAStatus setPropertyByteArray(const std::string& in_propertyName,
+                                              const std::vector<uint8_t>& in_value) override;
+    ::ndk::ScopedAStatus setPropertyString(const std::string& in_propertyName,
+                                           const std::string& in_value) override;
+    ::ndk::ScopedAStatus sign(const std::vector<uint8_t>& in_sessionId,
+                              const std::vector<uint8_t>& in_keyId,
+                              const std::vector<uint8_t>& in_message,
+                              std::vector<uint8_t>* _aidl_return) override;
+    ::ndk::ScopedAStatus signRSA(const std::vector<uint8_t>& in_sessionId,
+                                 const std::string& in_algorithm,
+                                 const std::vector<uint8_t>& in_message,
+                                 const std::vector<uint8_t>& in_wrappedkey,
+                                 std::vector<uint8_t>* _aidl_return) override;
+    ::ndk::ScopedAStatus verify(const std::vector<uint8_t>& in_sessionId,
+                                const std::vector<uint8_t>& in_keyId,
+                                const std::vector<uint8_t>& in_message,
+                                const std::vector<uint8_t>& in_signature,
+                                bool* _aidl_return) override;
+};
+
+}  // namespace castkey
+}  // namespace drm
+}  // namespace hardware
+}  // namespace android
+}  // namespace aidl
+
+#endif  // DRM_PLUGIN_H_

cast_auth/mediadrm/include/SessionLibrary.h

@@ -0,0 +1,28 @@
+#ifndef SESSION_LIBRARY_H_
+#define SESSION_LIBRARY_H_
+
+#include <mutex>
+#include <vector>
+
+namespace castkeydrm {
+
+class SessionLibrary {
+public:
+    static SessionLibrary* get();
+    std::vector<uint8_t> createSession();
+    void closeSession(const std::vector<uint8_t>& session);
+
+private:
+    SessionLibrary() : next_session_id_(1) {}
+
+    static std::mutex singleton_lock_;
+    static SessionLibrary* singleton_;
+
+    std::mutex session_lock_;
+    uint32_t next_session_id_;
+    std::vector<std::vector<uint8_t>> sessions_;
+};
+
+} // namespace castkeydrm
+
+#endif // SESSION_LIBRARY_H_

cast_auth/mediadrm/include/Utils.h

@@ -0,0 +1,44 @@
+#ifndef UTILS_H_
+#define UTILS_H_
+
+#include <string>
+
+#include "SessionLibrary.h"
+
+#include <android/binder_auto_utils.h>
+#include "aidl/android/hardware/drm/Status.h"
+#include "CastKeyTypes.h"
+
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace drm {
+namespace castkey {
+
+inline ::ndk::ScopedAStatus toNdkScopedAStatus(::aidl::android::hardware::drm::Status status,
+                                               const char* msg = nullptr) {
+    if (Status::OK == status) {
+        return ::ndk::ScopedAStatus::ok();
+    } else {
+        auto err = static_cast<int32_t>(status);
+        if (msg) {
+            return ::ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(err, msg);
+        } else {
+            return ::ndk::ScopedAStatus::fromServiceSpecificError(err);
+        }
+    }
+}
+
+inline ::ndk::ScopedAStatus toNdkScopedAStatus(castkeydrm::CdmResponseType res) {
+    return toNdkScopedAStatus(static_cast<::aidl::android::hardware::drm::Status>(res));
+}
+
+#define UNUSED(x) (void)(x);
+
+}  // namespace castkey
+}  // namespace drm
+}  // namespace hardware
+}  // namespace android
+}  // namespace aidl
+
+#endif  // UTILS_H_

cast_auth/mediadrm/manifest_android.hardware.drm-service.castkey.xml

@@ -0,0 +1,7 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>android.hardware.drm</name>
+        <version>1</version>
+        <fqname>IDrmFactory/castkey</fqname>
+    </hal>
+</manifest>

conf/init.tangorpro.rc

@@ -20,7 +20,7 @@ on early-boot
     wait_for_prop vendor.common.modules.ready 1
     start insmod_sh_tangorpro
 
-service insmod_sh_tangorpro /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.tangorpro.cfg
+service insmod_sh_tangorpro /vendor/bin/insmod.sh /vendor/etc/init.insmod.tangorpro.cfg
     class main
     user root
     group root system

device-evolution.mk

@@ -1,6 +1,8 @@
 #
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-evolution

device-lineage.mk

@@ -1,18 +1,40 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
 
 # ANGLE - Almost Native Graphics Layer Engine
 PRODUCT_PACKAGES += \
     ANGLE
 
+# Kernel
+TARGET_PREBUILT_KERNEL := device/google/tangorpro-kernel/Image.lz4
+
+# Build necessary packages for vendor
+
+# Codec2
+PRODUCT_PACKAGES += \
+    libacryl \
+    libacryl_hdr_plugin \
+    libexynosv4l2
+
 # GMS
 WITH_GMS_COMMS_SUITE := false
 
+# Graphics
+PRODUCT_PACKAGES += \
+    libEGL_angle \
+    libGLESv1_CM_angle \
+    libGLESv2_angle
+
+# Identity credential
+PRODUCT_PACKAGES += \
+    android.hardware.identity_credential.xml
+
 # RRO
 PRODUCT_PACKAGES += \
     GrilRadioCustomizableNoRadio \
@@ -22,20 +44,9 @@ PRODUCT_PACKAGES += \
     TitanSettingsProviderOverlay \
     TitanSysuiConfigOverlay
 
-# Build necessary packages for vendor
-
-# Codec2
-PRODUCT_PACKAGES += \
-    libacryl \
-    libacryl_hdr_plugin \
-    libexynosv4l2
-
-# Graphics
-PRODUCT_PACKAGES += \
-    libEGL_angle \
-    libGLESv1_CM_angle \
-    libGLESv2_angle
-
 # Sensors
 PRODUCT_PACKAGES += \
     sensors.dynamic_sensor_hal
+
+# Properties
+TARGET_VENDOR_PROP := $(LOCAL_PATH)/vendor.prop

device-tangorpro.mk

@@ -14,13 +14,18 @@
 # limitations under the License.
 #
 
+TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/tangorpro-kernel/kernel-headers
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT
-TARGET_RECOVERY_DEFAULT_TOUCH_ROTATION := $(TARGET_RECOVERY_DEFAULT_ROTATION)
 
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_TANGORPRO_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TANGORPRO_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TANGORPRO_DIR)/kernel-headers
+ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)/kernel-headers
+endif
 
 BOARD_WITHOUT_RADIO := true
 
@@ -57,7 +62,7 @@ DISABLE_TELEPHONY_EUICC := true
 
 include device/google/tangorpro/audio/tangorpro/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
-include device/google/gs-common/touch/gti/predump_gti.mk
+include device/google/gs-common/touch/gti/gti.mk
 include device/google/gs-common/touch/nvt/nvt.mk
 include device/google/gs-common/led/led.mk
 include device/google/gs-common/wlan/dump.mk
@@ -77,8 +82,7 @@ PRODUCT_DEXPREOPT_SPEED_APPS += SystemUITitan  # For tablet
 # Touch files
 PRODUCT_COPY_FILES += \
         device/google/tangorpro/NVTCapacitiveTouchScreen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitiveTouchScreen.idc \
-        device/google/tangorpro/NVTCapacitivePen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitivePen.idc \
-        device/google/tangorpro/USI_Stylus.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/USI_Stylus.idc
+        device/google/tangorpro/NVTCapacitivePen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitivePen.idc
 
 # Init files
 PRODUCT_COPY_FILES += \
@@ -88,13 +92,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
         device/google/tangorpro/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.tangorpro.rc
 
-# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
-# own copy if they're not in the prebuilts.
-# TODO(b/369686096): drop this when 5.10 is gone.
-ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
+# insmod files
 PRODUCT_COPY_FILES += \
-	device/google/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.tangorpro.cfg
-endif
+	device/google/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.tangorpro.cfg
 
 # Camera
 PRODUCT_COPY_FILES += \
@@ -132,10 +132,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PRODUCT_PROPERTIES += \
 	persist.bluetooth.opus.enabled=true
 
-# Enable Bluetooth AutoOn feature
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.server.automatic_turn_on=true
-
 # Keymaster HAL
 #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
 
@@ -175,6 +171,13 @@ include device/google/tangorpro/fingerprint_config.mk
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q2
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk
+endif
 
 # Wifi SAP Interface Name
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -216,12 +219,14 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
         libcast_auth
 
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
         test_cast_auth
 
 # USI stylus test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
         usi_test
+endif
 
 # Lights HAL
 PRODUCT_PACKAGES += \
@@ -263,6 +268,10 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/lib64
 
+# CastKey Drm plugin modules
+PRODUCT_PACKAGES += \
+	android.hardware.drm-service.castkey
+
 # MIPI Coex Configs
 PRODUCT_COPY_FILES += \
     device/google/tangorpro/radio/tangor_camera_front_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_front_mipi_coex_table.csv \
@@ -276,32 +285,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.camera.adjust_backend_min_freq_for_1p_front_video_1080p_30fps=1 \
     persist.vendor.camera.bypass_sensor_binning_resolution_condition=1 \
     persist.vendor.camera.extended_launch_boost=1 \
-    persist.vendor.camera.raise_buf_allocation_priority=1 \
-    camera.enable_landscape_to_portrait=true
+    persist.vendor.camera.raise_buf_allocation_priority=1
 
 # Enable camera exif model/make reporting
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
-# Set device family property for SMR
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.build.device_family=T6P
-
-# Set build properties for SMR builds
-ifeq ($(RELEASE_IS_SMR), true)
-    ifneq (,$(RELEASE_BASE_OS_TANGORPRO))
-        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_TANGORPRO)
-    endif
-endif
-
-# Set build properties for EMR builds
-ifeq ($(RELEASE_IS_EMR), true)
-    ifneq (,$(RELEASE_BASE_OS_TANGORPRO))
-        PRODUCT_PROPERTY_OVERRIDES += \
-        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_TANGORPRO)
-    endif
-endif
-
 # Audio
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.audio.multi_usb_mode=true
@@ -323,8 +312,3 @@ PRODUCT_PACKAGES += \
 # SKU specific RROs
 PRODUCT_PACKAGES += \
     SettingsOverlayGTU8P
-
-# PlayVideos
-PLAYVIDEOS_VERSION_DIR := 4.38.72.77
-$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
-PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)

evolution.dependencies

@@ -4,8 +4,8 @@
     "target_path": "device/google/gs201"
   },
   {
-    "repository": "device/google/tangorpro-kernels/6.1",
-    "target_path": "device/google/tangorpro-kernels/6.1",
+    "repository": "device/google/tangorpro-kernel",
+    "target_path": "device/google/tangorpro-kernel",
     "remote": "aosp-tangorpro"
   }
 ]

extract-files.py

@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-MY_DIR="$(cd "$(dirname "${0}")"; pwd -P)"
-
-pushd "${MY_DIR}/tangorpro"
-./extract-files.py $@
-popd

extract-files.sh

@@ -0,0 +1,120 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=tangorpro
+VENDOR=google
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../.."
+
+export TARGET_ENABLE_CHECKELF=true
+
+# If XML files don't have comments before the XML header, use this flag
+# Can still be used with broken XML files by using blob_fixup
+export TARGET_DISABLE_XML_FIXING=true
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+# Default to sanitizing the vendor folder before extraction
+CLEAN_VENDOR=true
+
+ONLY_FIRMWARE=
+KANG=
+SECTION=
+VENDOR_SKIP_FILES=()
+
+while [ "${#}" -gt 0 ]; do
+    case "${1}" in
+        --only-firmware)
+            ONLY_FIRMWARE=true
+            ;;
+        -n | --no-cleanup)
+            CLEAN_VENDOR=false
+            ;;
+        -k | --kang)
+            KANG="--kang"
+            ;;
+        -s | --section)
+            SECTION="${2}"
+            shift
+            CLEAN_VENDOR=false
+            ;;
+        *)
+            SRC="${1}"
+            ;;
+    esac
+    shift
+done
+
+if [ -z "${SRC}" ]; then
+    SRC="adb"
+fi
+
+function prepare_firmware() {
+    if [ "${SRC}" != "adb" ]; then
+        bash "${ANDROID_ROOT}"/lineage/scripts/pixel/prepare-firmware.sh "${DEVICE}" "${SRC}"
+    fi
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
+
+if [ -z "${ONLY_FIRMWARE}" ]; then
+    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+
+    readarray -t VENDOR_SKIP_FILES < <(cat "${MY_DIR}/skip-files-vendor.txt" | sed -E "/^[[:blank:]]*(#|$)/d")
+    VENDOR_TXT="${MY_DIR}/proprietary-files-vendor.txt"
+    generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES
+
+    # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets
+    set_disable_checkelf "vendor/lib/libExynosC2H263Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2H263Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2H264Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2H264Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2HevcDec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H263Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H263Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H264Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H264Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2HevcDec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
+
+    set_module_suffix "vendor/lib/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
+    set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
+    set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}"
+
+    extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+fi
+
+if [ -z "${SECTION}" ]; then
+    extract_firmware "${MY_DIR}/proprietary-firmware.txt" "${SRC}"
+fi
+
+"${MY_DIR}/setup-makefiles.sh"

lineage_tangorpro.mk

@@ -1,35 +1,33 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit some common Evolution X stuff
+# Inherit some common Evolution X stuff.
 TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_tablet_wifionly.mk)
 
 # Inherit device configuration
-DEVICE_CODENAME := tangorpro
-DEVICE_PATH := device/google/tangorpro
-VENDOR_PATH := vendor/google/tangorpro
-$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/tangorpro/aosp_tangorpro.mk)
 $(call inherit-product, device/google/gs201/lineage_common.mk)
 $(call inherit-product, device/google/gs201/evolution_common.mk)
-$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
-$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk)
+$(call inherit-product, device/google/tangorpro/device-lineage.mk)
+$(call inherit-product, device/google/tangorpro/device-evolution.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel Tablet
-PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+PRODUCT_NAME := lineage_tangorpro
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 1600
 TARGET_SCREEN_WIDTH := 2560
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="tangorpro-user 15 BP1A.250505.005 13277524 release-keys" \
-    BuildFingerprint=google/tangorpro/tangorpro:15/BP1A.250505.005/13277524:user/release-keys \
-    DeviceProduct=$(DEVICE_CODENAME)
+    TARGET_PRODUCT=tangorpro \
+    PRIVATE_BUILD_DESC="tangorpro-user 14 AP2A.240905.003 12231197 release-keys"
 
-$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
+BUILD_FINGERPRINT := google/tangorpro/tangorpro:14/AP2A.240905.003/12231197:user/release-keys
+
+$(call inherit-product, vendor/google/tangorpro/tangorpro-vendor.mk)

manifest.xml

@@ -48,6 +48,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.mapper</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>4.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>

modules.blocklist.vendor_kernel_boot

@@ -1,2 +0,0 @@
-blocklist goog_touch_interface.ko
-blocklist nvt_touch.ko

modules.load.vendor_kernel_boot

@@ -1,2 +0,0 @@
-extra/goog_touch_interface.ko
-extra/nvt_touch.ko

overlay-lineage/frameworks/base/core/res/res/values/config.xml

@@ -18,12 +18,6 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Whether per-app fullscreen override option is allowed in user aspect ratio settings -->
-    <bool name="config_appCompatUserAppAspectRatioFullscreenIsEnabled">true</bool>
-
-    <!-- Whether per-app user aspect ratio override settings is enabled -->
-    <bool name="config_appCompatUserAppAspectRatioSettingsIsEnabled">true</bool>
-
     <!-- Control whether being in the desk dock should enable accelerometer
          based screen orientation.  This defaults to true because it is
          common for desk docks to be sold in a variety of form factors

powerhint.json

@@ -863,12 +863,6 @@
       "Duration": 33,
       "Value": "1014000"
     },
-    {
-      "PowerHint": "CPU_LOAD_RESET",
-      "Node": "TAPreferHighCap",
-      "Duration": 33,
-      "Value": "1"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "MemFreq",
@@ -1638,6 +1632,18 @@
       "Duration": 50,
       "Value": "1"
     },
+    {
+      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
+      "Node": "LimitFlashCurrent",
+      "Duration": 0,
+      "Value": "100"
+    },
+    {
+      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
+      "Node": "LimitFlashCurrent",
+      "Duration": 0,
+      "Value": "1500"
+    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",
@@ -1875,28 +1881,16 @@
       "PID_Du": 0.0,
       "UclampMin_On": true,
       "UclampMin_Init": 182,
-      "UclampMin_LoadUp": 514,
-      "UclampMin_LoadReset": 514,
       "UclampMin_High": 514,
       "UclampMin_Low": 2,
-      "UclampMax_EfficientBase": 500,
-      "UclampMax_EfficientOffset": 200,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
       "ReportingRateLimitNs": 166666660,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0,
-      "HeuristicBoost_On": true,
-      "HBoostModerateJankThreshold": 2,
-      "HBoostOffMaxAvgDurRatio": 4.0,
-      "HBoostSevereJankPidPu": 0.5,
-      "HBoostSevereJankThreshold": 8,
-      "HBoostUclampMinCeilingRange": [480, 722],
-      "HBoostUclampMinFloorRange": [230, 410],
-      "JankCheckTimeFactor": 1.2,
-      "LowFrameRateThreshold": 25,
-      "MaxRecordsNum": 300
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1916,9 +1910,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
-      "UclampMax_EfficientBase": 500,
-      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     },
@@ -1940,9 +1934,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
-      "UclampMax_EfficientBase": 500,
-      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     },
@@ -1964,9 +1958,9 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
-      "UclampMax_EfficientBase": 500,
-      "UclampMax_EfficientOffset": 200,
       "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 5.0
     }

proprietary-files-vendor.txt

@@ -1,17 +1,17 @@
 # All blobs below are extracted from the release mentioned in proprietary-files.txt
-vendor/apex/com.google.android.widevine-12141839.apex
+vendor/apex/com.google.android.widevine-wv_341113000.apex
 vendor/apex/com.google.pixel.camera.hal.apex
 vendor/apex/com.google.pixel.wifi.ext.apex
 vendor/bin/aocd
 vendor/bin/aocxd
-vendor/bin/flood.control.hal
 vendor/bin/hw/android.hardware.authsecret-service.citadel
 vendor/bin/hw/android.hardware.biometrics.fingerprint-service.fpc42
 vendor/bin/hw/android.hardware.bluetooth@1.1-service.synabtlinux
+vendor/bin/hw/android.hardware.confirmationui-service.trusty.vendor
 vendor/bin/hw/android.hardware.contexthub-service.generic
-vendor/bin/hw/android.hardware.drm-service.castkey
 vendor/bin/hw/android.hardware.edgetpu.logging@service-edgetpu-logging
 vendor/bin/hw/android.hardware.gxp.logging@service-gxp-logging
+vendor/bin/hw/android.hardware.identity@1.0-service.citadel
 vendor/bin/hw/android.hardware.input.processor-service
 vendor/bin/hw/android.hardware.neuralnetworks@service-darwinn-aidl
 vendor/bin/hw/android.hardware.oemlock-service.citadel
@@ -21,6 +21,7 @@ vendor/bin/hw/android.hardware.weaver-service.citadel
 vendor/bin/hw/battery_mitigation
 vendor/bin/hw/citadel_updater
 vendor/bin/hw/citadeld
+vendor/bin/hw/com.google.edgetpu.dba-service
 vendor/bin/hw/com.google.edgetpu.tachyon-service
 vendor/bin/hw/google.hardware.media.c2@1.0-service
 vendor/bin/hw/init_citadel
@@ -31,24 +32,26 @@ vendor/bin/hw/vendor.google.edgetpu_vendor_service@1.0-service
 vendor/bin/hw/vendor.google.google_battery-service
 vendor/bin/hw/vendor.google.radioext@1.0-service
 vendor/bin/init.camera.set-interrupts-ownership
+vendor/bin/securedpud.slider
 vendor/bin/sscoredump
 vendor/bin/trusty_metricsd
 vendor/bin/twoshay
 vendor/bin/umfw_stat_tool
 vendor/bin/usf_stats
-vendor/etc/Khronos/OpenCL/vendors/ARM.icd
 vendor/etc/aoc/waveform_aec_graph.tflite
 vendor/etc/atc_profile.json
 vendor/etc/chre/activity.napp_header
 vendor/etc/chre/activity.so
+vendor/etc/chre/ambient.napp_header
+vendor/etc/chre/ambient.so
+vendor/etc/chre/ambient_micro.napp_header
+vendor/etc/chre/ambient_micro.so
 vendor/etc/chre/ambient_volume.napp_header
 vendor/etc/chre/ambient_volume.so
 vendor/etc/chre/ar_bridge.napp_header
 vendor/etc/chre/ar_bridge.so
 vendor/etc/chre/blue.napp_header
 vendor/etc/chre/blue.so
-vendor/etc/chre/capo.napp_header
-vendor/etc/chre/capo.so
 vendor/etc/chre/cc.napp_header
 vendor/etc/chre/cc.so
 vendor/etc/chre/drop.napp_header
@@ -64,6 +67,8 @@ vendor/etc/chre/ip_health.so
 vendor/etc/chre/libchre_log_database.bin
 vendor/etc/chre/motiondetector.napp_header
 vendor/etc/chre/motiondetector.so
+vendor/etc/chre/nearby.napp_header
+vendor/etc/chre/nearby.so
 vendor/etc/chre/preloaded_nanoapps.json
 vendor/etc/chre/sd.napp_header
 vendor/etc/chre/sd.so
@@ -73,18 +78,17 @@ vendor/etc/chre/system_signal_hub.napp_header
 vendor/etc/chre/system_signal_hub.so
 vendor/etc/chre/uv_exposure.napp_header
 vendor/etc/chre/uv_exposure.so
-vendor/etc/chre/vice.napp_header
-vendor/etc/chre/vice.so
 vendor/etc/display_settings.xml
 vendor/etc/displayconfig/display_id_4619827677550801152.xml
 vendor/etc/init/Exynos_C2.rc
 vendor/etc/init/android.hardware.authsecret-service.citadel.rc
 vendor/etc/init/android.hardware.bluetooth@1.1-service.synabtlinux.rc
 vendor/etc/init/android.hardware.camera.provider@2.7-service-google-apex.rc
+vendor/etc/init/android.hardware.confirmationui-service.trusty.vendor.rc
 vendor/etc/init/android.hardware.contexthub-service.generic.rc
-vendor/etc/init/android.hardware.drm-service.castkey.rc
 vendor/etc/init/android.hardware.edgetpu.logging@service-edgetpu-logging.rc
 vendor/etc/init/android.hardware.gxp.logging@service-gxp-logging.rc
+vendor/etc/init/android.hardware.identity@1.0-service.citadel.rc
 vendor/etc/init/android.hardware.input.processor-service.rc
 vendor/etc/init/android.hardware.neuralnetworks@service-darwinn-aidl.rc
 vendor/etc/init/android.hardware.oemlock-service.citadel.rc
@@ -94,17 +98,21 @@ vendor/etc/init/android.hardware.weaver-service.citadel.rc
 vendor/etc/init/aocd.rc
 vendor/etc/init/aocxd.rc
 vendor/etc/init/citadeld.rc
+vendor/etc/init/com.google.edgetpu.dba-service.rc
 vendor/etc/init/com.google.edgetpu.tachyon-service.rc
 vendor/etc/init/fingerprint-fpc42.rc
 vendor/etc/init/google.hardware.media.c2@1.0-service.rc
 vendor/etc/init/init.camera.set-interrupts-ownership.rc
-vendor/etc/init/init.flood.control.rc
 vendor/etc/init/init.sscoredump.rc
 vendor/etc/init/init.usf.rc
 vendor/etc/init/init_dauntless.rc
+vendor/etc/init/libg3a_gabc.rc
+vendor/etc/init/libg3a_gaf.rc
+vendor/etc/init/libg3a_ghawb.rc
 vendor/etc/init/qorvo.uwb-calib.rc
 vendor/etc/init/qorvo.uwb-service.rc
 vendor/etc/init/samsung.hardware.media.c2@1.2-service.rc
+vendor/etc/init/securedpud.slider.rc
 vendor/etc/init/trusty_metricsd.rc
 vendor/etc/init/twoshay.rc
 vendor/etc/init/vendor.dolby.media.c2@1.0-service.rc
@@ -114,6 +122,9 @@ vendor/etc/init/vendor.google.edgetpu_vendor_service@1.0-service.rc
 vendor/etc/init/vendor.google.google_battery-default.rc
 vendor/etc/init/vendor.google.radioext@1.0-service.rc
 vendor/etc/input_classifier_model.pb
+vendor/etc/libg3a_standalone_gabc_rc
+vendor/etc/libg3a_standalone_gaf_rc
+vendor/etc/libg3a_standalone_ghawb_rc
 vendor/etc/media_codecs_aosp_c2.xml
 vendor/etc/media_codecs_dolby_c2.xml
 vendor/etc/modem_stat.conf
@@ -134,16 +145,16 @@ vendor/etc/uwb/calib_paths
 vendor/etc/uwb/libuwb-uci.conf
 vendor/etc/vintf/manifest/android.hardware.authsecret-service.citadel.xml
 vendor/etc/vintf/manifest/android.hardware.camera.provider@2.7-service-google-apex.xml
+vendor/etc/vintf/manifest/android.hardware.confirmationui-service.trusty.vendor.xml
 vendor/etc/vintf/manifest/android.hardware.contexthub-service.generic.xml
+vendor/etc/vintf/manifest/android.hardware.identity.strongbox.xml
 vendor/etc/vintf/manifest/android.hardware.neuralnetworks@service-darwinn-aidl.xml
 vendor/etc/vintf/manifest/android.hardware.oemlock-service.citadel.xml
 vendor/etc/vintf/manifest/android.hardware.security.keymint-service.citadel.xml
 vendor/etc/vintf/manifest/android.hardware.weaver-service.citadel.xml
+vendor/etc/vintf/manifest/com.google.edgetpu.dba-service.xml
 vendor/etc/vintf/manifest/com.google.edgetpu.tachyon-service.xml
 vendor/etc/vintf/manifest/fingerprint-fpc42.xml
-vendor/etc/vintf/manifest/flood_control.xml
-vendor/etc/vintf/manifest/manifest_android.hardware.drm-service.castkey.xml
-vendor/etc/vintf/manifest/manifest_aocx.xml
 vendor/etc/vintf/manifest/manifest_input.processor-service.xml
 vendor/etc/vintf/manifest/manifest_radioext.xml
 vendor/etc/vintf/manifest/manifest_wifi_ext_aidl.xml
@@ -157,6 +168,11 @@ vendor/firmware/aoc.bin
 vendor/firmware/bcmdhd.cal
 vendor/firmware/bcmdhd_clm.blob
 vendor/firmware/cast_auth.app
+vendor/firmware/cs40l26-calib.bin
+vendor/firmware/cs40l26-calib.wmfw
+vendor/firmware/cs40l26-svc.bin
+vendor/firmware/cs40l26.bin
+vendor/firmware/cs40l26.wmfw
 vendor/firmware/dauntless/d3m2.ec.bin
 vendor/firmware/dauntless/evt.ec.bin
 vendor/firmware/dauntless/proto11.ec.bin
@@ -175,11 +191,8 @@ vendor/firmware/gxp_fw_core1
 vendor/firmware/gxp_fw_core2
 vendor/firmware/gxp_fw_core3
 vendor/firmware/logstrs.bin
-vendor/firmware/mali_csffw-r48p0.bin
-vendor/firmware/mali_csffw-r49p0.bin
-vendor/firmware/mali_csffw-r50p0.bin
-vendor/firmware/mali_csffw-r51p0.bin
-vendor/firmware/mali_csffw-r52p0.bin
+vendor/firmware/mali_csffw-r47p0.bin
+vendor/firmware/mali_csffw.bin
 vendor/firmware/mfc_fw.bin
 vendor/firmware/novatek_ts_fw.bin
 vendor/firmware/novatek_ts_fw_csot.bin
@@ -191,7 +204,6 @@ vendor/firmware/syna/BTFW_B.hcd
 vendor/framework/com.google.android.camera.experimental2022.jar
 vendor/lib/aoc_aud_ext.so
 vendor/lib/aoc_audio_stereo_spatializer.so
-vendor/lib/aocx-V1-ndk.so
 vendor/lib/audio_adapted_info_features.so
 vendor/lib/audio_amcs_ext.so
 vendor/lib/audio_apmg3_aoc.so
@@ -204,7 +216,7 @@ vendor/lib/audio_spk_35l41.so
 vendor/lib/audio_tunnel_aoc.so
 vendor/lib/audio_usb_aoc.so
 vendor/lib/audio_waves_aoc.so
-vendor/lib/com.google.edgetpu_app_service-V3-ndk.so;MODULE_SUFFIX=_vendor
+vendor/lib/com.google.edgetpu_app_service-V3-ndk.so;MODULE_SUFFIX=-vendor
 vendor/lib/egl/libGLES_mali.so
 vendor/lib/gxp_metrics_logger.so
 vendor/lib/hw/audio.platform.aoc.so
@@ -214,19 +226,20 @@ vendor/lib/hw/vendor.google.whitechapel.audio.audioext@4.0-impl.so
 vendor/lib/hw/vulkan.mali.so
 vendor/lib/libAlgFx_HiFi3z.so
 vendor/lib/libExynosC2ComponentStore.so
-vendor/lib/libExynosC2H263Dec.so
-vendor/lib/libExynosC2H263Enc.so
-vendor/lib/libExynosC2H264Dec.so
-vendor/lib/libExynosC2H264Enc.so
-vendor/lib/libExynosC2HevcDec.so
-vendor/lib/libExynosC2HevcEnc.so
-vendor/lib/libExynosC2Mpeg4Dec.so
-vendor/lib/libExynosC2Mpeg4Enc.so
-vendor/lib/libExynosC2Vp8Dec.so
-vendor/lib/libExynosC2Vp8Enc.so
-vendor/lib/libExynosC2Vp9Dec.so
-vendor/lib/libExynosC2Vp9Enc.so
+vendor/lib/libExynosC2H263Dec.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2H263Enc.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2H264Dec.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2H264Enc.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2HevcDec.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2HevcEnc.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2Mpeg4Dec.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2Mpeg4Enc.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2Vp8Dec.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2Vp8Enc.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2Vp9Dec.so;DISABLE_CHECKELF
+vendor/lib/libExynosC2Vp9Enc.so;DISABLE_CHECKELF
 vendor/lib/libOpenCL-pixel.so
+vendor/lib/libOpenCL.so
 vendor/lib/lib_aion_buffer.so
 vendor/lib/libadaptedinfo.so
 vendor/lib/libamcsextfile.so
@@ -239,7 +252,6 @@ vendor/lib/libcast_auth.so
 vendor/lib/libcast_auth_aidl-cpp.so
 vendor/lib/libdisplaycolor.so
 vendor/lib/libedgetpu_client.google.so
-vendor/lib/libedgetpu_tachyon.google.so
 vendor/lib/libfvsam_prm_parser.so
 vendor/lib/libgc2_av1_dec.so
 vendor/lib/libgc2_base.so
@@ -259,19 +271,21 @@ vendor/lib/libusf.so
 vendor/lib/sensors.usf.so
 vendor/lib/soundfx/liboffloadeffect.so
 vendor/lib/soundfx/libspatialaudio.so
+vendor/lib/vendor-pixelatoms-cpp.so
 vendor/lib/vendor.google.battery_mitigation-V1-ndk.so
 vendor/lib/vendor.google.battery_mitigation.service_static.so
 vendor/lib/vendor.google.whitechapel.audio.audioext@4.0.so
 vendor/lib64/android.hardware.authsecret-impl.nos.so
+vendor/lib64/android.hardware.confirmationui.secure_input_citadel.so
+vendor/lib64/android.hardware.identity@1.0-impl.nos.so
+vendor/lib64/android.hardware.keymaster@4.1-impl.nos.so
 vendor/lib64/android.hardware.oemlock-impl.nos.so
 vendor/lib64/android.hardware.security.keymint-impl.nos.so
 vendor/lib64/android.hardware.weaver-bridge.nos.so
 vendor/lib64/android.hardware.weaver-impl.nos.so
 vendor/lib64/android.hardware.weaver2-impl.nos.so
-vendor/lib64/aoc_aconfig_flags_c_lib.so
 vendor/lib64/aoc_aud_ext.so
 vendor/lib64/aoc_audio_stereo_spatializer.so
-vendor/lib64/aocx-V1-ndk.so
 vendor/lib64/audio_adapted_info_features.so
 vendor/lib64/audio_amcs_ext.so
 vendor/lib64/audio_apmg3_aoc.so
@@ -286,13 +300,14 @@ vendor/lib64/audio_usb_aoc.so
 vendor/lib64/audio_waves_aoc.so
 vendor/lib64/biometricsuez.so
 vendor/lib64/com.fingerprints42.extension@1.0.so
+vendor/lib64/com.google.edgetpu.dba-V1-ndk.so
 vendor/lib64/com.google.edgetpu.tachyon-V1-ndk.so
-vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so;MODULE_SUFFIX=_vendor
-vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so;MODULE_SUFFIX=_vendor
+vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so;MODULE_SUFFIX=-vendor
+vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so;MODULE_SUFFIX=-vendor
 vendor/lib64/com.google.hardware.biometrics.parcelable.fingerprint.PressToAuthParcelable-V1-ndk.so
 vendor/lib64/com.google.hardware.biometrics.sidefps.fingerprint-ext-V1-ndk.so
 vendor/lib64/com.google.input-V2-ndk.so
-vendor/lib64/com.google.input-V4-ndk.so
+vendor/lib64/com.google.input-V3-ndk.so
 vendor/lib64/egl/libGLES_mali.so
 vendor/lib64/fake_gxp_telemetry_reader.so
 vendor/lib64/fpc42_suez.so
@@ -307,19 +322,20 @@ vendor/lib64/hw/vendor.google.whitechapel.audio.audioext@4.0-impl.so
 vendor/lib64/hw/vulkan.mali.so
 vendor/lib64/libAlgFx_HiFi3z.so
 vendor/lib64/libExynosC2ComponentStore.so
-vendor/lib64/libExynosC2H263Dec.so
-vendor/lib64/libExynosC2H263Enc.so
-vendor/lib64/libExynosC2H264Dec.so
-vendor/lib64/libExynosC2H264Enc.so
-vendor/lib64/libExynosC2HevcDec.so
-vendor/lib64/libExynosC2HevcEnc.so
-vendor/lib64/libExynosC2Mpeg4Dec.so
-vendor/lib64/libExynosC2Mpeg4Enc.so
-vendor/lib64/libExynosC2Vp8Dec.so
-vendor/lib64/libExynosC2Vp8Enc.so
-vendor/lib64/libExynosC2Vp9Dec.so
-vendor/lib64/libExynosC2Vp9Enc.so
+vendor/lib64/libExynosC2H263Dec.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2H263Enc.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2H264Dec.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2H264Enc.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2HevcDec.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2HevcEnc.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2Mpeg4Dec.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2Mpeg4Enc.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2Vp8Dec.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2Vp8Enc.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2Vp9Dec.so;DISABLE_CHECKELF
+vendor/lib64/libExynosC2Vp9Enc.so;DISABLE_CHECKELF
 vendor/lib64/libOpenCL-pixel.so
+vendor/lib64/libOpenCL.so
 vendor/lib64/lib_aion_buffer.so
 vendor/lib64/lib_reader.so
 vendor/lib64/libadaptedinfo.so
@@ -334,12 +350,12 @@ vendor/lib64/libcast_auth_aidl-cpp.so
 vendor/lib64/libcodec2_soft_ddpdec.so
 vendor/lib64/libcodec2_store_dolby.so
 vendor/lib64/libdapparamstorage.so
+vendor/lib64/libdarwinn_dba_hal_runtime.so
 vendor/lib64/libdarwinn_hal.so
 vendor/lib64/libdeccfg.so
 vendor/lib64/libdeeptouch.so
 vendor/lib64/libdisplaycolor.so
 vendor/lib64/libedgetpu_client.google.so
-vendor/lib64/libedgetpu_tachyon.google.so
 vendor/lib64/libedgetpu_tflite_compiler.so
 vendor/lib64/libedgetpu_util.so
 vendor/lib64/libfvsam_prm_parser.so

proprietary-files.txt

@@ -3,8 +3,8 @@
 # product partition
 
 # AiAi
-product/priv-app/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01.apk;PRESIGNED
-product/priv-app/DevicePersonalizationPrebuiltPixelTablet2023-U.32_V.7_playstore_aiai_20240725.00_RC08/DevicePersonalizationPrebuiltPixelTablet2023-U.32_V.7_playstore_aiai_20240725.00_RC08.apk;PRESIGNED
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixelTablet2023-v.U.14.playstore/DevicePersonalizationPrebuiltPixelTablet2023-v.U.14.playstore.apk;PRESIGNED
 
 # Audio
 product/etc/ambient/matcher_tah.leveldb
@@ -20,11 +20,6 @@ product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIG
 product/etc/permissions/androidx.camera.extensions.impl.xml
 product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED
 
-# Camera services
-product/etc/permissions/com.google.pixel.camera.connectivity.impl.xml
-product/etc/permissions/com.google.pixel.camera.services.cameraidremapper.impl.xml
-product/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.impl.xml
-
 # Cast
 product/etc/default-permissions/default-permissions_SmartDisplayPrebuilt.xml
 product/etc/permissions/com.google.android.apps.mediashell.xml
@@ -81,16 +76,6 @@ system_ext/etc/permissions/com.google.android.camerax.extensions.xml
 system_ext/framework/com.google.android.camera.extensions.jar
 system_ext/framework/com.google.android.camerax.extensions.jar
 
-# Camera services
-system_ext/app/PersistentBackgroundCameraServices/PersistentBackgroundCameraServices.apk
-system_ext/etc/permissions/com.google.pixel.camera.connectivity.xml
-system_ext/etc/permissions/com.google.pixel.camera.services.cameraidremapper.xml
-system_ext/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.xml
-system_ext/etc/vintf/manifest/com.google.pixel.camera.services@1.0-service-google.xml
-system_ext/framework/com.google.pixel.camera.connectivity.jar
-system_ext/framework/com.google.pixel.camera.services.cameraidremapper.jar
-system_ext/framework/com.google.pixel.camera.services.lyricconfigprovider.jar
-
 # Dock
 system_ext/priv-app/DockSetup/DockSetup.apk;PRESIGNED
 
@@ -99,8 +84,10 @@ system_ext/bin/hw/vendor.google.edgetpu_app_service@1.0-service
 system_ext/etc/init/vendor.google.edgetpu_app_service@1.0-service.rc
 system_ext/etc/public.libraries-google.txt
 system_ext/etc/vintf/manifest/vendor.google.edgetpu_app_service@1.0-service.xml
+system_ext/lib/libedgetpu_dba.google.so
 system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so
 system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so
+system_ext/lib64/libedgetpu_dba.google.so
 
 # HBM
 system_ext/lib64/libhbmsvmanager_jni.so;SYMLINK=system_ext/priv-app/HbmSVManager/lib/arm64/libhbmsvmanager_jni.so
@@ -122,11 +109,3 @@ system_ext/priv-app/grilservice/grilservice.apk;PRESIGNED
 # UWB
 system_ext/etc/permissions/privapp-permissions-qorvo.xml
 system_ext/priv-app/UwbVendorService/UwbVendorService.apk;PRESIGNED
-
-# vendor partition
-
-# Touchscreen
-vendor/firmware/novatek_ts_fw.bin:recovery/root/vendor/firmware/novatek_ts_fw.bin
-vendor/firmware/novatek_ts_fw_csot.bin:recovery/root/vendor/firmware/novatek_ts_fw_csot.bin
-vendor/firmware/novatek_ts_mp.bin:recovery/root/vendor/firmware/novatek_ts_mp.bin
-vendor/firmware/novatek_ts_mp_csot.bin:recovery/root/vendor/firmware/novatek_ts_mp_csot.bin

rro_overlays/UwbOverlay/res/values/config.xml

@@ -63,10 +63,4 @@
     This works best with an FOV primer setting below 90 degrees to ensure that predictions are being
     used across the 90-degree threshold. -->
     <bool name="enable_azimuth_mirroring">false</bool>
-
-    <!-- Whether to use a persistent cache in the algorithm to determine country code or not.
-    If enabled, will fallback to the cache to determine device location for
-    UWB regulatory purposes when  other sources (telephony, wifi, location, etc) is not available.
-    -->
-    <bool name = "persistent_cache_use_for_country_code_enabled">true</bool>
 </resources>

sepolicy/tangorpro-sepolicy.mk

@@ -5,5 +5,10 @@ BOARD_SEPOLICY_DIRS += device/google/tangorpro/sepolicy/tracking_denials
 # fingerprint
 BOARD_SEPOLICY_DIRS += device/google/tangorpro/sepolicy/fingerprint_capacitance
 
+# for mediashell
+PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/atv/audio_proxy/sepolicy/public
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/atv/audio_proxy/sepolicy/vendor
+PRODUCT_PRIVATE_SEPOLICY_DIRS += vendor/google/gms/src/sepolicy/tv
+
 # system_ext
 SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/tangorpro/sepolicy/system_ext/private

sepolicy/tracking_denials/bug_map

@@ -1,3 +1,5 @@
+
+audioserver vendor_file file b/312069156
 platform_app system_data_file dir b/289358324
 shell sysfs_touch dir b/264823366
 system_app proc_pagetypeinfo file b/312375728

sepolicy/vendor/file.te

@@ -1,5 +1,8 @@
 #Pogo USB control & status
 type sysfs_pogo_usb, sysfs_type, fs_type;
 
+# Cast device certificate
+type device_cert_file, file_type, vendor_persist_type;
+
 # Avoid GPS se failed
 type sysfs_gps, sysfs_type, fs_type;

sepolicy/vendor/file_contexts

@@ -9,3 +9,7 @@
 
 # Privacy LED
 /vendor/bin/hw/android\.hardware\.lights-service\.tangorpro          u:object_r:hal_light_default_exec:s0
+
+# Cast Factory Credentials
+/vendor/bin/hw/android\.hardware\.drm-service\.castkey u:object_r:hal_drm_cast_exec:s0
+/mnt/vendor/persist/nest/cast_auth\.crt                u:object_r:device_cert_file:s0

sepolicy/vendor/genfs_contexts

@@ -7,7 +7,6 @@ genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0   u:object_
 # system suspend wakeup files
 genfscon sysfs /devices/platform/google,dock/power_supply/dock/wakeup                                                     u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/power_supply/nvt-pen-battery/wakeup                  u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/power_supply/USI_Stylus_Battery/wakeup               u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/input/input2/wakeup                                  u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/wakeup                                               u:object_r:sysfs_wakeup:s0
 

sepolicy/vendor/hal_drm_cast.te

@@ -0,0 +1,9 @@
+type hal_drm_cast, domain;
+type hal_drm_cast_exec, exec_type, vendor_file_type, file_type;
+
+init_daemon_domain(hal_drm_cast)
+hal_server_domain(hal_drm_cast, hal_drm)
+
+allow hal_drm_cast mnt_vendor_file:dir search;
+allow hal_drm_cast persist_file:dir search;
+allow hal_drm_cast device_cert_file:file r_file_perms;

sepolicy/vendor/hal_health_default.te

@@ -1 +0,0 @@
-dontaudit hal_health_default sysfs_touch:dir *;

sepolicy/vendor/service_contexts

@@ -0,0 +1,2 @@
+# Cast Factory Credentials
+android.hardware.drm.IDrmFactory/castkey                         u:object_r:hal_drm_service:s0

setup-makefiles.py

@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-MY_DIR="$(cd "$(dirname "${0}")"; pwd -P)"
-
-pushd "${MY_DIR}/tangorpro"
-./setup-makefiles.py
-popd

setup-makefiles.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=tangorpro
+VENDOR=google
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../.."
+
+export TARGET_ENABLE_CHECKELF=true
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+function vendor_imports() {
+    cat <<EOF >>"$1"
+		"device/google/tangorpro",
+		"hardware/google/av",
+		"hardware/google/gchips",
+		"hardware/google/graphics/common",
+		"hardware/google/interfaces",
+		"hardware/google/pixel",
+EOF
+}
+
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        com.google.edgetpu_app_service-V3-ndk | \
+            com.google.edgetpu_vendor_service-V2-ndk)
+            echo "$1-vendor"
+            ;;
+        libprotobuf-cpp-full-21.12)
+            echo "libprotobuf-cpp-full"
+            ;;
+        libprotobuf-cpp-lite-21.12)
+            echo "libprotobuf-cpp-lite"
+            ;;
+        libacryl | \
+            libexynosv4l2) ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_vendor_variants "$@"
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
+
+# Warning headers and guards
+write_headers
+
+write_makefiles "${MY_DIR}/proprietary-files.txt"
+write_makefiles "${MY_DIR}/proprietary-files-vendor.txt"
+
+append_firmware_calls_to_makefiles "${MY_DIR}/proprietary-firmware.txt"
+
+# Finish
+write_footers

skip-files-vendor.txt

@@ -1,10 +1,10 @@
 # Standard build output with vendor image build enabled
+apex/com.android.hardware.cas.apex
 bin/[
 bin/acpi
 bin/awk
 bin/base64
 bin/basename
-bin/blkdiscard
 bin/blockdev
 bin/boringssl_self_test32
 bin/boringssl_self_test64
@@ -38,20 +38,18 @@ bin/du
 bin/dump/dump_aoc
 bin/dump/dump_devfreq
 bin/dump/dump_display
-bin/dump/dump_fingerprint
-bin/dump/dump_modem
+bin/dump/dump_gti0.sh
+bin/dump/dump_modem.sh
 bin/dump/dump_modemlog
 bin/dump/dump_perf
 bin/dump/dump_pixel_metrics
-bin/dump/dump_power
+bin/dump/dump_power_gs201.sh
 bin/dump/dump_sensors
 bin/dump/dump_soc
 bin/dump/dump_storage
 bin/dump/dump_thermal.sh
-bin/dump/dump_touch.sh
 bin/dump/dump_trusty.sh
 bin/dump/dump_umfw_stat
-bin/dump_touch/predump_gti0.sh
 bin/dumpsys
 bin/echo
 bin/egrep
@@ -71,7 +69,6 @@ bin/getconf
 bin/getenforce
 bin/getevent
 bin/getfattr
-bin/getopt
 bin/getprop
 bin/gpiodetect
 bin/gpiofind
@@ -89,10 +86,11 @@ bin/hw/android.hardware.audio.service
 bin/hw/android.hardware.boot-service.default-pixel
 bin/hw/android.hardware.cas@1.2-service
 bin/hw/android.hardware.composer.hwc3-service.pixel
+bin/hw/android.hardware.drm-service.castkey
 bin/hw/android.hardware.drm-service.clearkey
 bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
-bin/hw/android.hardware.graphics.allocator-V2-service
+bin/hw/android.hardware.graphics.allocator-V1-service
 bin/hw/android.hardware.health-service.gs201
 bin/hw/android.hardware.health.storage-service.default
 bin/hw/android.hardware.lights-service.tangorpro
@@ -100,7 +98,6 @@ bin/hw/android.hardware.memtrack-service.pixel
 bin/hw/android.hardware.power-service.pixel-libperfmgr
 bin/hw/android.hardware.power.stats-service.pixel
 bin/hw/android.hardware.security.keymint-service.trusty
-bin/hw/android.hardware.security.secretkeeper.trusty
 bin/hw/android.hardware.sensors-service.multihal
 bin/hw/android.hardware.thermal-service.pixel
 bin/hw/android.hardware.usb-service
@@ -172,7 +169,6 @@ bin/pidof
 bin/pixelstats-vendor
 bin/pkill
 bin/pmap
-bin/predump_touch.sh
 bin/printenv
 bin/printf
 bin/ps
@@ -227,7 +223,6 @@ bin/timeout
 bin/toolbox
 bin/top
 bin/touch
-bin/touch_gti_ical
 bin/toybox_vendor
 bin/tr
 bin/true
@@ -265,11 +260,10 @@ etc/NOTICE.xml.gz
 etc/a2dp_audio_policy_configuration_7_0.xml
 etc/a2dp_in_audio_policy_configuration_7_0.xml
 etc/aconfig_flags.pb
-etc/aidl/hfp/hfp_codec_capabilities.xml
 etc/aidl/le_audio/aidl_audio_set_configurations.bfbs
+etc/aidl/le_audio/aidl_audio_set_configurations.json
 etc/aidl/le_audio/aidl_audio_set_scenarios.bfbs
-etc/aidl/le_audio/aidl_default_audio_set_configurations.json
-etc/aidl/le_audio/aidl_default_audio_set_scenarios.json
+etc/aidl/le_audio/aidl_audio_set_scenarios.json
 etc/aoc/BLUETOOTH.dat
 etc/aoc/HANDSET.dat
 etc/aoc/HANDSFREE.dat
@@ -312,7 +306,6 @@ etc/boringssl_self_test.no_zygote.rc
 etc/boringssl_self_test.zygote32.rc
 etc/boringssl_self_test.zygote64.rc
 etc/boringssl_self_test.zygote64_32.rc
-etc/bpf/filterPowerSupplyEvents.o
 etc/build_flags.json
 etc/cert-chain.crt
 etc/default_volume_tables.xml
@@ -337,19 +330,20 @@ etc/fstab.zram.6g
 etc/group
 etc/hearing_aid_audio_policy_configuration_7_0.xml
 etc/init.common.cfg
+etc/init.insmod.tangorpro.cfg
 etc/init/android.hardware.audio.service.rc
 etc/init/android.hardware.boot-service.default-pixel.rc
 etc/init/android.hardware.cas@1.2-service.rc
+etc/init/android.hardware.drm-service.castkey.rc
 etc/init/android.hardware.drm-service.clearkey.rc
 etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
-etc/init/android.hardware.graphics.allocator2-aidl-service.rc
+etc/init/android.hardware.graphics.allocator-aidl-service.rc
 etc/init/android.hardware.health-service.gs201.rc
 etc/init/android.hardware.lights-service.tangorpro.rc
 etc/init/android.hardware.power-service.pixel-libperfmgr.rc
 etc/init/android.hardware.power.stats-service.pixel.rc
 etc/init/android.hardware.security.keymint-service.trusty.rc
-etc/init/android.hardware.security.secretkeeper.trusty.rc
 etc/init/android.hardware.sensors-service-multihal.rc
 etc/init/android.hardware.thermal-service.pixel.rc
 etc/init/android.hardware.usb-service.rc
@@ -362,22 +356,14 @@ etc/init/gpu_probe.rc
 etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
 etc/init/hw/init.gs201.rc
-etc/init/hw/init.gs201.storage.rc
 etc/init/hw/init.gs201.usb.rc
 etc/init/hw/init.tangorpro.rc
 etc/init/hwc3-pixel.rc
 etc/init/init.aoc.rc
-etc/init/init.fingerprint.dump.rc
 etc/init/init.module.rc
-etc/init/init.pixel-mm-gs.rc
-etc/init/init.pixel-perf.rc
 etc/init/init.pixel.rc
 etc/init/init.storage.rc
 etc/init/init.touch.gti0.rc
-etc/init/init.touch.predump.rc
-etc/init/libg3a_gabc.rc
-etc/init/libg3a_gaf.rc
-etc/init/libg3a_ghawb.rc
 etc/init/memtrack.rc
 etc/init/pixel-mm-gki.rc
 etc/init/pixel-thermal-symlinks.rc
@@ -387,9 +373,6 @@ etc/init/storage.gs201.rc
 etc/init/vndservicemanager.rc
 etc/led_golden_calibration_LUT_black_CG.txt
 etc/led_golden_calibration_LUT_white_CG.txt
-etc/libg3a_standalone_gabc_rc
-etc/libg3a_standalone_gaf_rc
-etc/libg3a_standalone_ghawb_rc
 etc/linker.config.pb
 etc/media_codecs.xml
 etc/media_codecs_c2.xml
@@ -420,7 +403,7 @@ etc/permissions/android.hardware.camera.xml
 etc/permissions/android.hardware.context_hub.xml
 etc/permissions/android.hardware.device_unique_attestation.xml
 etc/permissions/android.hardware.fingerprint.xml
-etc/permissions/android.hardware.hardware_keystore_V3.xml
+etc/permissions/android.hardware.hardware_keystore.xml
 etc/permissions/android.hardware.keystore.app_attest_key.xml
 etc/permissions/android.hardware.opengles.aep.xml
 etc/permissions/android.hardware.sensor.accelerometer.xml
@@ -442,6 +425,7 @@ etc/permissions/android.hardware.wifi.direct.xml
 etc/permissions/android.hardware.wifi.passpoint.xml
 etc/permissions/android.hardware.wifi.rtt.xml
 etc/permissions/android.hardware.wifi.xml
+etc/permissions/android.software.contextualsearch.xml
 etc/permissions/android.software.device_id_attestation.xml
 etc/permissions/android.software.ipsec_tunnel_migration.xml
 etc/permissions/android.software.ipsec_tunnels.xml
@@ -451,12 +435,10 @@ etc/permissions/android.software.telecom.xml
 etc/permissions/android.software.verified_boot.xml
 etc/permissions/android.software.vulkan.deqp.level.xml
 etc/permissions/aosp_excluded_hardware.xml
-etc/permissions/features_com.android.virt.xml
 etc/permissions/tablet_core_hardware.xml
 etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 etc/powerhint.json
 etc/r_submix_audio_policy_configuration.xml
-etc/selinux/genfs_labels_version.txt
 etc/selinux/plat_pub_versioned.cil
 etc/selinux/plat_sepolicy_vers.txt
 etc/selinux/precompiled_sepolicy
@@ -466,7 +448,6 @@ etc/selinux/precompiled_sepolicy.system_ext_sepolicy_and_mapping.sha256
 etc/selinux/selinux_denial_metadata
 etc/selinux/vendor_file_contexts
 etc/selinux/vendor_hwservice_contexts
-etc/selinux/vendor_keystore2_key_contexts
 etc/selinux/vendor_mac_permissions.xml
 etc/selinux/vendor_property_contexts
 etc/selinux/vendor_seapp_contexts
@@ -547,7 +528,6 @@ etc/vintf/manifest/android.hardware.lights-service.tangorpro.xml
 etc/vintf/manifest/android.hardware.power-service.pixel.xml
 etc/vintf/manifest/android.hardware.power.stats-service.pixel.xml
 etc/vintf/manifest/android.hardware.security.keymint-service.trusty.xml
-etc/vintf/manifest/android.hardware.security.secretkeeper.trusty.xml
 etc/vintf/manifest/android.hardware.sensors-multihal.xml
 etc/vintf/manifest/android.hardware.thermal-service.pixel.xml
 etc/vintf/manifest/android.hardware.usb-service.xml
@@ -558,8 +538,8 @@ etc/vintf/manifest/android.hardware.wifi.supplicant.xml
 etc/vintf/manifest/bluetooth_audio.xml
 etc/vintf/manifest/health-storage-default.xml
 etc/vintf/manifest/hwc3-default.xml
-etc/vintf/manifest/manifest.xml
-etc/vintf/manifest/manifest_gralloc_aidl2.xml
+etc/vintf/manifest/manifest_android.hardware.drm-service.castkey.xml
+etc/vintf/manifest/manifest_gralloc_aidl.xml
 etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/pixel-display-default.xml
 etc/waves_config.ini
@@ -585,7 +565,7 @@ firmware/cs35l41-dsp1-spk-prot.bin
 firmware/cs35l41-dsp1-spk-prot.wmfw
 firmware/readme_bottom.md
 firmware/readme_top.md
-lib/android.hardware.audio.common-V4-ndk.so
+lib/android.hardware.audio.common-V3-ndk.so
 lib/android.hardware.audio.common-util.so
 lib/android.hardware.audio.common@2.0.so
 lib/android.hardware.audio.common@5.0.so
@@ -599,13 +579,13 @@ lib/android.hardware.audio.effect@7.0.so
 lib/android.hardware.audio@7.0.so
 lib/android.hardware.audio@7.1-util.so
 lib/android.hardware.audio@7.1.so
-lib/android.hardware.bluetooth.audio-V5-ndk.so
+lib/android.hardware.bluetooth.audio-V4-ndk.so
 lib/android.hardware.bluetooth.audio-impl.so
 lib/android.hardware.bluetooth.audio@2.0.so
 lib/android.hardware.bluetooth.audio@2.1.so
 lib/android.hardware.common-V2-ndk.so
 lib/android.hardware.common.fmq-V1-ndk.so
-lib/android.hardware.graphics.common-V6-ndk.so
+lib/android.hardware.graphics.common-V5-ndk.so
 lib/android.hardware.graphics.common@1.0.so
 lib/android.hardware.graphics.common@1.1.so
 lib/android.hardware.graphics.common@1.2.so
@@ -621,11 +601,12 @@ lib/android.hidl.allocator@1.0.so
 lib/android.hidl.memory.token@1.0.so
 lib/android.hidl.memory@1.0.so
 lib/android.hidl.safe_union@1.0.so
-lib/android.media.audio.common.types-V4-ndk.so
+lib/android.media.audio.common.types-V3-ndk.so
 lib/android.system.suspend-V1-ndk.so
 lib/arm.graphics-V1-ndk.so
 lib/hw/android.hardware.audio.effect@7.0-impl.so
 lib/hw/android.hardware.audio@7.1-impl.so
+lib/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib/hw/android.hardware.soundtrigger@2.3-impl.so
 lib/hw/android.hidl.memory@1.0-impl.so
 lib/hw/audio.bluetooth.default.so
@@ -635,11 +616,8 @@ lib/hw/audio.usb.default.so
 lib/hw/audio.usbv2.default.so
 lib/hw/gralloc.default.so
 lib/hw/local_time.default.so
-lib/hw/mapper.pixel.so
 lib/hw/power.default.so
 lib/hw/vibrator.default.so
-lib/libOpenCL.so
-lib/libaconfig_storage_read_api_cc.so
 lib/libalsautils.so
 lib/libalsautilsv2.so
 lib/libaudioutils.so
@@ -684,8 +662,6 @@ lib/libxml2.so
 lib/libz.so
 lib/mediacas/libclearkeycasplugin.so
 lib/mediadrm/libdrmclearkeyplugin.so
-lib/modules/6lowpan.ko
-lib/modules/8021q.ko
 lib/modules/acpm_flexpmu_dbg.ko
 lib/modules/acpm_mbox_test.ko
 lib/modules/aoc_alsa_dev.ko
@@ -694,47 +670,32 @@ lib/modules/aoc_channel_dev.ko
 lib/modules/aoc_char_dev.ko
 lib/modules/aoc_control_dev.ko
 lib/modules/aoc_core.ko
-lib/modules/aoc_tbn_service_dev.ko
-lib/modules/aoc_unit_test_dev.ko
 lib/modules/aoc_usb_driver.ko
 lib/modules/aoc_uwb_platform_drv.ko
 lib/modules/aoc_uwb_service_dev.ko
-lib/modules/aqc111.ko
+lib/modules/arm-memlat-mon.ko
 lib/modules/arm_dsu_pmu.ko
-lib/modules/asix.ko
 lib/modules/at24.ko
 lib/modules/audiometrics.ko
-lib/modules/ax88179_178a.ko
-lib/modules/bbd_pps_gpio.ko
 lib/modules/bc_max77759.ko
 lib/modules/bcm47765.ko
 lib/modules/bcm_dbg.ko
-lib/modules/bigwave.ko
-lib/modules/bluetooth.ko
-lib/modules/bsd_comp.ko
-lib/modules/btbcm.ko
-lib/modules/btqca.ko
+lib/modules/bigocean.ko
 lib/modules/bts.ko
-lib/modules/btsdio.ko
-lib/modules/can-bcm.ko
-lib/modules/can-dev.ko
-lib/modules/can-gw.ko
-lib/modules/can-raw.ko
-lib/modules/can.ko
-lib/modules/cdc-acm.ko
-lib/modules/cdc_eem.ko
-lib/modules/cdc_ether.ko
-lib/modules/cdc_ncm.ko
-lib/modules/cfg80211.ko
-lib/modules/clk_exynos_gs.ko
+lib/modules/clk_exynos.ko
 lib/modules/cmupmucal.ko
+lib/modules/coresight-etm4x.ko
+lib/modules/coresight-funnel.ko
+lib/modules/coresight-replicator.ko
+lib/modules/coresight-tmc.ko
+lib/modules/coresight.ko
+lib/modules/crc-t10dif.ko
+lib/modules/crct10dif_common.ko
+lib/modules/crct10dif_generic.ko
 lib/modules/dbgcore-dump.ko
 lib/modules/debug-reboot.ko
 lib/modules/debug-snapshot-debug-kinfo.ko
-lib/modules/diag.ko
-lib/modules/drm_display_helper.ko
 lib/modules/dss.ko
-lib/modules/dw3000-core-tests.ko
 lib/modules/dw3000.ko
 lib/modules/dwc3-exynos-usb.ko
 lib/modules/ect_parser.ko
@@ -751,7 +712,6 @@ lib/modules/exynos-cpuhp.ko
 lib/modules/exynos-cpupm.ko
 lib/modules/exynos-debug-test.ko
 lib/modules/exynos-dm.ko
-lib/modules/exynos-drm-audio.ko
 lib/modules/exynos-drm.ko
 lib/modules/exynos-ecc-handler.ko
 lib/modules/exynos-pcie-iommu.ko
@@ -761,69 +721,50 @@ lib/modules/exynos-pd_el3.ko
 lib/modules/exynos-pd_hsi0.ko
 lib/modules/exynos-pm.ko
 lib/modules/exynos-pmu-if.ko
+lib/modules/exynos-reboot.ko
 lib/modules/exynos-seclog.ko
 lib/modules/exynos_devfreq.ko
 lib/modules/exynos_mct.ko
 lib/modules/exynos_mfc.ko
 lib/modules/exynos_pm_qos.ko
 lib/modules/exynos_tty.ko
-lib/modules/fips140.ko
 lib/modules/fpc1020_platform_tee.ko
-lib/modules/ftdi_sio.ko
 lib/modules/g2d.ko
 lib/modules/goodixfp.ko
 lib/modules/goog_touch_interface.ko
-lib/modules/goog_usi_stylus.ko
 lib/modules/google-battery.ko
 lib/modules/google-bms.ko
 lib/modules/google-charger.ko
 lib/modules/google-cpm.ko
 lib/modules/google_bcl.ko
-lib/modules/google_ccd.ko
 lib/modules/google_dock.ko
 lib/modules/google_dual_batt_gauge.ko
-lib/modules/google_tcpci_shim.ko
+lib/modules/governor_memlat.ko
 lib/modules/gpu_cooling.ko
 lib/modules/gs-chipid.ko
-lib/modules/gs-drm-connector.ko
-lib/modules/gs-panel.ko
 lib/modules/gs_acpm.ko
-lib/modules/gs_governor_memlat.ko
-lib/modules/gs_governor_utils.ko
-lib/modules/gs_perf_mon.ko
 lib/modules/gs_thermal.ko
 lib/modules/gsa.ko
 lib/modules/gsa_gsc.ko
 lib/modules/gvotable.ko
 lib/modules/gxp.ko
-lib/modules/gzvm.ko
 lib/modules/hardlockup-debug.ko
 lib/modules/hardlockup-watchdog.ko
-lib/modules/hci_uart.ko
 lib/modules/heatmap.ko
-lib/modules/hidp.ko
 lib/modules/i2c-acpm.ko
 lib/modules/i2c-dev.ko
 lib/modules/i2c-exynos5.ko
-lib/modules/ieee802154.ko
-lib/modules/ieee802154_6lowpan.ko
-lib/modules/ieee802154_socket.ko
 lib/modules/itmon.ko
 lib/modules/janeiro.ko
 lib/modules/kernel-top.ko
 lib/modules/keycombo.ko
 lib/modules/keydebug.ko
-lib/modules/kheaders.ko
-lib/modules/l2tp_core.ko
-lib/modules/l2tp_ppp.ko
 lib/modules/leds-pwm.ko
-lib/modules/libarc4.ko
-lib/modules/ln8411.ko
 lib/modules/logbuffer.ko
 lib/modules/lp855x_bl.ko
 lib/modules/lwis.ko
-lib/modules/mac80211.ko
-lib/modules/mac802154.ko
+lib/modules/lzo-rle.ko
+lib/modules/lzo.ko
 lib/modules/mailbox-wc.ko
 lib/modules/mali_kbase.ko
 lib/modules/mali_kutf.ko
@@ -834,52 +775,27 @@ lib/modules/max20339.ko
 lib/modules/max77729-pmic.ko
 lib/modules/max77729_charger.ko
 lib/modules/max77729_uic.ko
-lib/modules/max77759-charger.ko
+lib/modules/max77759_charger.ko
 lib/modules/max77759_contaminant.ko
 lib/modules/max77759_helper.ko
-lib/modules/max77779-charger-i2c.ko
-lib/modules/max77779-charger.ko
-lib/modules/max77779-fg-i2c.ko
-lib/modules/max77779-fg.ko
-lib/modules/max77779-fwupdate.ko
-lib/modules/max77779-sp-i2c.ko
-lib/modules/max77779-sp.ko
-lib/modules/max77779-vimon-i2c.ko
-lib/modules/max77779-vimon.ko
-lib/modules/max77779_contaminant.ko
-lib/modules/max77779_i2cm.ko
-lib/modules/max77779_i2cm_i2c.ko
-lib/modules/max77779_pmic.ko
-lib/modules/max77779_pmic_i2c.ko
-lib/modules/max77779_pmic_irq.ko
-lib/modules/max77779_pmic_pinctrl.ko
-lib/modules/max77779_pmic_sgpio.ko
-lib/modules/max777x9_contaminant.ko
 lib/modules/mcps802154.ko
 lib/modules/mcps802154_region_fira.ko
 lib/modules/mcps802154_region_nfcc_coex.ko
 lib/modules/mcps802154_region_pctt.ko
-lib/modules/mii.ko
+lib/modules/memlat-devfreq.ko
 lib/modules/modules.alias
 lib/modules/modules.blocklist
 lib/modules/modules.dep
 lib/modules/modules.load
 lib/modules/modules.softdep
-lib/modules/nfc.ko
-lib/modules/nhc_dest.ko
-lib/modules/nhc_fragment.ko
-lib/modules/nhc_hop.ko
-lib/modules/nhc_ipv6.ko
-lib/modules/nhc_mobility.ko
-lib/modules/nhc_routing.ko
-lib/modules/nhc_udp.ko
 lib/modules/nitrous.ko
+lib/modules/null_blk.ko
 lib/modules/nvt_touch.ko
-lib/modules/odpm-whi.ko
+lib/modules/odpm.ko
+lib/modules/overheat_mitigation.ko
 lib/modules/p9221.ko
 lib/modules/panel-boe-nt37290.ko
 lib/modules/panel-boe-ts110f5mlg0.ko
-lib/modules/panel-common.ko
 lib/modules/panel-csot-ppa957db2d.ko
 lib/modules/panel-samsung-drv.ko
 lib/modules/panel-samsung-emul.ko
@@ -891,17 +807,16 @@ lib/modules/panel-samsung-s6e3hc3.ko
 lib/modules/panel-samsung-s6e3hc4.ko
 lib/modules/panel-samsung-sofef01.ko
 lib/modules/pca9468.ko
-lib/modules/pcie-exynos-gs.ko
+lib/modules/pcie-exynos-core.ko
 lib/modules/pcie-exynos-gs201-rc-cal.ko
 lib/modules/phy-exynos-mipi-dsim.ko
 lib/modules/phy-exynos-mipi.ko
 lib/modules/phy-exynos-usbdrd-super.ko
-lib/modules/pinctrl-exynos-gs.ko
+lib/modules/pinctrl-samsung-core.ko
 lib/modules/pinctrl-slg51000.ko
 lib/modules/pinctrl-slg51002.ko
 lib/modules/pixel-boot-metrics.ko
 lib/modules/pixel-debug-test.ko
-lib/modules/pixel-reboot.ko
 lib/modules/pixel-suspend-diag.ko
 lib/modules/pixel_em.ko
 lib/modules/pixel_metrics.ko
@@ -912,21 +827,12 @@ lib/modules/pl330.ko
 lib/modules/pmic_class.ko
 lib/modules/pogo_transport.ko
 lib/modules/power_stats.ko
-lib/modules/ppp_deflate.ko
-lib/modules/ppp_generic.ko
-lib/modules/ppp_mppe.ko
-lib/modules/pppox.ko
-lib/modules/pptp.ko
-lib/modules/pwm-exynos.ko
-lib/modules/r8152.ko
-lib/modules/r8153_ecm.ko
-lib/modules/rfcomm.ko
-lib/modules/rfkill.ko
+lib/modules/pps-gpio.ko
+lib/modules/pps_core.ko
+lib/modules/pwm-samsung.ko
 lib/modules/rt4539_bl.ko
 lib/modules/rt4801-regulator.ko
-lib/modules/rt9471_charger.ko
 lib/modules/rtc-s2mpg12.ko
-lib/modules/rtl8150.ko
 lib/modules/s2mpg12-key.ko
 lib/modules/s2mpg12-mfd.ko
 lib/modules/s2mpg12-powermeter.ko
@@ -935,7 +841,7 @@ lib/modules/s2mpg13-mfd.ko
 lib/modules/s2mpg13-powermeter.ko
 lib/modules/s2mpg13-regulator.ko
 lib/modules/s2mpg13_spmic_thermal.ko
-lib/modules/s2mpg1x-gpio.ko
+lib/modules/s2mpg1x-gpio-gs201.ko
 lib/modules/s3c2410_wdt.ko
 lib/modules/samsung-dma.ko
 lib/modules/samsung-iommu-group.ko
@@ -944,35 +850,37 @@ lib/modules/samsung_dma_heap.ko
 lib/modules/samsung_iommu.ko
 lib/modules/sbb-mux.ko
 lib/modules/sched_tp.ko
+lib/modules/scsi_debug.ko
 lib/modules/sg.ko
 lib/modules/sjtag-driver.ko
 lib/modules/slc_acpm.ko
 lib/modules/slc_dummy.ko
 lib/modules/slc_pmon.ko
 lib/modules/slc_pt.ko
-lib/modules/slcan.ko
 lib/modules/slg51000-core.ko
 lib/modules/slg51000-regulator.ko
 lib/modules/slg51002-core.ko
 lib/modules/slg51002-regulator.ko
-lib/modules/slhc.ko
 lib/modules/smfc.ko
 lib/modules/snd-soc-cs35l41-i2c.ko
 lib/modules/snd-soc-cs35l41-spi.ko
 lib/modules/snd-soc-cs35l41.ko
+lib/modules/snd-soc-cs35l45-i2c.ko
+lib/modules/snd-soc-cs35l45-spi.ko
+lib/modules/snd-soc-cs35l45.ko
 lib/modules/snd-soc-wm-adsp.ko
 lib/modules/softdog.ko
 lib/modules/spi-s3c64xx.ko
 lib/modules/spidev.ko
 lib/modules/sscoredump.ko
-lib/modules/sscoredump_sample_test.ko
-lib/modules/sscoredump_test.ko
+lib/modules/st21nfc.ko
+lib/modules/st33spi.ko
+lib/modules/st54spi.ko
 lib/modules/stmvl53l1.ko
 lib/modules/synadhd.ko
 lib/modules/sysrq-hook.ko
 lib/modules/systrace.ko
 lib/modules/tcpci_max77759.ko
-lib/modules/tipc.ko
 lib/modules/touch_bus_negotiator.ko
 lib/modules/touch_offload.ko
 lib/modules/tps65132-regulator.ko
@@ -981,28 +889,24 @@ lib/modules/trusty-ipc.ko
 lib/modules/trusty-log.ko
 lib/modules/trusty-test.ko
 lib/modules/trusty-virtio.ko
-lib/modules/ufs-exynos-gs.ko
+lib/modules/ufs-exynos-core.ko
 lib/modules/ufs-pixel-fips140.ko
 lib/modules/usb_f_dm.ko
 lib/modules/usb_f_dm1.ko
 lib/modules/usb_f_etr_miu.ko
+lib/modules/usb_f_rndis.ko
 lib/modules/usb_psy.ko
 lib/modules/usbc_cooling_dev.ko
-lib/modules/usbnet.ko
-lib/modules/usbserial.ko
-lib/modules/vcan.ko
 lib/modules/vh_cgroup.ko
 lib/modules/vh_fs.ko
 lib/modules/vh_mm.ko
 lib/modules/vh_preemptirq_long.ko
 lib/modules/vh_sched.ko
 lib/modules/vh_thermal.ko
-lib/modules/wwan.ko
 lib/modules/xhci-exynos.ko
 lib/modules/zcomp_cpu.ko
 lib/modules/zcomp_eh.ko
 lib/modules/zram.ko
-lib/modules/zram_gs.ko
 lib/modules/zsmalloc.ko
 lib/server_configurable_flags.so
 lib/soundfx/libaudiopreprocessing.so
@@ -1017,7 +921,7 @@ lib/soundfx/libvisualizer.so
 lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/android.frameworks.stats-V1-ndk.so
 lib64/android.frameworks.stats-V2-ndk.so
-lib64/android.hardware.audio.common-V4-ndk.so
+lib64/android.hardware.audio.common-V3-ndk.so
 lib64/android.hardware.audio.common-util.so
 lib64/android.hardware.audio.common@2.0.so
 lib64/android.hardware.audio.common@5.0.so
@@ -1031,7 +935,7 @@ lib64/android.hardware.audio.effect@7.0.so
 lib64/android.hardware.audio@7.0.so
 lib64/android.hardware.audio@7.1-util.so
 lib64/android.hardware.audio@7.1.so
-lib64/android.hardware.bluetooth.audio-V5-ndk.so
+lib64/android.hardware.bluetooth.audio-V4-ndk.so
 lib64/android.hardware.bluetooth.audio-impl.so
 lib64/android.hardware.bluetooth.audio@2.0.so
 lib64/android.hardware.bluetooth.audio@2.1.so
@@ -1045,18 +949,19 @@ lib64/android.hardware.cas@1.2.so
 lib64/android.hardware.common-V2-ndk.so
 lib64/android.hardware.common.fmq-V1-ndk.so
 lib64/android.hardware.drm-V1-ndk.so
-lib64/android.hardware.drm.common-V1-ndk.so
 lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
+lib64/android.hardware.graphics.allocator-V1-ndk.so
 lib64/android.hardware.graphics.allocator-V2-ndk.so
 lib64/android.hardware.graphics.allocator@2.0.so
 lib64/android.hardware.graphics.allocator@3.0.so
 lib64/android.hardware.graphics.allocator@4.0.so
-lib64/android.hardware.graphics.common-V6-ndk.so
+lib64/android.hardware.graphics.common-V3-ndk.so
+lib64/android.hardware.graphics.common-V5-ndk.so
 lib64/android.hardware.graphics.common@1.0.so
 lib64/android.hardware.graphics.common@1.1.so
 lib64/android.hardware.graphics.common@1.2.so
-lib64/android.hardware.graphics.composer3-V4-ndk.so
+lib64/android.hardware.graphics.composer3-V3-ndk.so
 lib64/android.hardware.graphics.composer@2.1-resources.so
 lib64/android.hardware.graphics.composer@2.1.so
 lib64/android.hardware.graphics.composer@2.2-resources.so
@@ -1067,13 +972,13 @@ lib64/android.hardware.graphics.mapper@2.0.so
 lib64/android.hardware.graphics.mapper@2.1.so
 lib64/android.hardware.graphics.mapper@3.0.so
 lib64/android.hardware.graphics.mapper@4.0.so
-lib64/android.hardware.health-V4-ndk.so
+lib64/android.hardware.health-V3-ndk.so
 lib64/android.hardware.health.storage-V1-ndk.so
 lib64/android.hardware.light-V2-ndk.so
 lib64/android.hardware.memtrack-V1-ndk.so
 lib64/android.hardware.power-V1-ndk.so
 lib64/android.hardware.power-V2-ndk.so
-lib64/android.hardware.power-V6-ndk.so
+lib64/android.hardware.power-V5-ndk.so
 lib64/android.hardware.power.stats-V2-ndk.so
 lib64/android.hardware.power.stats-impl.gs-common.so
 lib64/android.hardware.power.stats-impl.gs201.so
@@ -1081,11 +986,11 @@ lib64/android.hardware.power.stats-impl.pixel.so
 lib64/android.hardware.radio@1.0.so
 lib64/android.hardware.radio@1.1.so
 lib64/android.hardware.security.keymint-V1-ndk.so
-lib64/android.hardware.security.keymint-V4-ndk.so
+lib64/android.hardware.security.keymint-V3-ndk.so
 lib64/android.hardware.security.rkp-V3-ndk.so
 lib64/android.hardware.security.secureclock-V1-ndk.so
 lib64/android.hardware.security.sharedsecret-V1-ndk.so
-lib64/android.hardware.sensors-V3-ndk.so
+lib64/android.hardware.sensors-V2-ndk.so
 lib64/android.hardware.sensors@1.0.so
 lib64/android.hardware.sensors@2.0-ScopedWakelock.so
 lib64/android.hardware.sensors@2.0.so
@@ -1096,28 +1001,29 @@ lib64/android.hardware.soundtrigger@2.1.so
 lib64/android.hardware.soundtrigger@2.2.so
 lib64/android.hardware.soundtrigger@2.3.so
 lib64/android.hardware.thermal-V1-ndk.so
-lib64/android.hardware.thermal-V3-ndk.so
+lib64/android.hardware.thermal-V2-ndk.so
 lib64/android.hardware.thermal@1.0.so
 lib64/android.hardware.thermal@2.0.so
 lib64/android.hardware.usb-V3-ndk.so
 lib64/android.hardware.usb.gadget-V1-ndk.so
 lib64/android.hardware.usb.gadget@1.0.so
-lib64/android.hardware.wifi-V3-ndk.so
-lib64/android.hardware.wifi.common-V2-ndk.so
-lib64/android.hardware.wifi.hostapd-V3-ndk.so
-lib64/android.hardware.wifi.supplicant-V4-ndk.so
+lib64/android.hardware.wifi-V2-ndk.so
+lib64/android.hardware.wifi.common-V1-ndk.so
+lib64/android.hardware.wifi.hostapd-V2-ndk.so
+lib64/android.hardware.wifi.supplicant-V3-ndk.so
 lib64/android.hidl.allocator@1.0.so
 lib64/android.hidl.memory.token@1.0.so
 lib64/android.hidl.memory@1.0.so
 lib64/android.hidl.safe_union@1.0.so
-lib64/android.media.audio.common.types-V4-ndk.so
+lib64/android.media.audio.common.types-V3-ndk.so
 lib64/android.system.keystore2-V1-ndk.so
 lib64/android.system.suspend-V1-ndk.so
 lib64/arm.graphics-V1-ndk.so
-lib64/com.google.hardware.pixel.display-V13-ndk.so
+lib64/com.google.hardware.pixel.display-V10-ndk.so
 lib64/hw/android.hardware.audio.effect@7.0-impl.so
 lib64/hw/android.hardware.audio@7.1-impl.so
 lib64/hw/android.hardware.graphics.allocator-aidl-impl.so
+lib64/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib64/hw/android.hardware.soundtrigger@2.3-impl.so
 lib64/hw/android.hidl.memory@1.0-impl.so
 lib64/hw/audio.bluetooth.default.so
@@ -1127,13 +1033,10 @@ lib64/hw/audio.usb.default.so
 lib64/hw/audio.usbv2.default.so
 lib64/hw/gralloc.default.so
 lib64/hw/local_time.default.so
-lib64/hw/mapper.pixel.so
 lib64/hw/power.default.so
 lib64/hw/vibrator.default.so
 lib64/libExynosHWCService.so
-lib64/libOpenCL.so
 lib64/lib_android_keymaster_keymint_utils.so
-lib64/libaconfig_storage_read_api_cc.so
 lib64/libacryl.so
 lib64/libacryl_hdr_plugin.so
 lib64/libalsautils.so
@@ -1149,6 +1052,8 @@ lib64/libbluetooth_audio_session_aidl.so
 lib64/libc++.so
 lib64/libcfg_if.dylib.so
 lib64/libclang_rt.ubsan_standalone-aarch64-android.so
+lib64/libcppbor_external.so
+lib64/libcppcose_rkp.so
 lib64/libcrypto.so
 lib64/libcutils.so
 lib64/libdisppower-pixel.so
@@ -1173,7 +1078,8 @@ lib64/libhwjpeg.so
 lib64/libion_google.so
 lib64/libjsoncpp.so
 lib64/libkeymaster_messages.so
-lib64/libkeymasterconfig.so
+lib64/libkeymaster_portable.so
+lib64/libkeymint.so
 lib64/libkeystore-engine-wifi-hidl.so
 lib64/liblibloading.dylib.so
 lib64/liblog_rust.dylib.so
@@ -1193,10 +1099,12 @@ lib64/libpower.so
 lib64/libprocessgroup.so
 lib64/libprotobuf-cpp-full-21.12.so
 lib64/libprotobuf-cpp-lite-21.12.so
+lib64/libpuresoftkeymasterdevice.so
 lib64/libreference-ril.so
 lib64/libril.so
 lib64/librilutils.so
 lib64/libsensorndkbridge.so
+lib64/libsoft_attestation_cert.so
 lib64/libspeechenhancer.so
 lib64/libspeexresampler.so
 lib64/libssl.so
@@ -1238,19 +1146,17 @@ lib64/soundfx/libvisualizer.so
 odm/etc/build.prop
 odm/etc/group
 odm/etc/passwd
-odm/etc/selinux/odm_file_contexts
-odm/etc/selinux/odm_hwservice_contexts
-odm/etc/selinux/odm_mac_permissions.xml
-odm/etc/selinux/odm_property_contexts
-odm/etc/selinux/odm_seapp_contexts
-odm/etc/selinux/odm_sepolicy.cil
-odm/etc/selinux/odm_service_contexts
 odm_dlkm/etc/build.prop
+overlay/EmergencyInfo__tangorpro__auto_generated_rro_vendor.apk
+overlay/Settings__tangorpro__auto_generated_rro_vendor.apk
+overlay/StorageManager__tangorpro__auto_generated_rro_vendor.apk
+overlay/SystemUI__tangorpro__auto_generated_rro_vendor.apk
+overlay/TeleService__tangorpro__auto_generated_rro_vendor.apk
+overlay/Traceur__tangorpro__auto_generated_rro_vendor.apk
+overlay/framework-res__tangorpro__auto_generated_rro_vendor.apk
 usr/idc/NVTCapacitivePen.idc
 usr/idc/NVTCapacitiveTouchScreen.idc
-usr/idc/USI_Stylus.idc
 vendor_dlkm/etc/build.prop
-vendor_dlkm/etc/init.insmod.tangorpro.cfg
 
 # Exclude overlays, symlinks and extra files that we override
 
@@ -1261,20 +1167,6 @@ overlay/Flipendo__tangorpro__auto_generated_rro_vendor.apk
 overlay/SettingsGoogle__tangorpro__auto_generated_rro_vendor.apk
 overlay/StorageManagerGoogle__tangorpro__auto_generated_rro_vendor.apk
 overlay/SystemUITitan__tangorpro__auto_generated_rro_vendor.apk
-overlay/TeleService__tangorpro__auto_generated_rro_vendor.apk
-overlay/Traceur__tangorpro__auto_generated_rro_vendor.apk
-overlay/framework-res__tangorpro__auto_generated_rro_vendor.apk
-
-# beta
-overlay/DeviceDiagnostics__tangorpro_beta__auto_generated_rro_vendor.apk
-overlay/DockSetup__tangorpro_beta__auto_generated_rro_vendor.apk
-overlay/Flipendo__tangorpro_beta__auto_generated_rro_vendor.apk
-overlay/SettingsGoogle__tangorpro_beta__auto_generated_rro_vendor.apk
-overlay/StorageManagerGoogle__tangorpro_beta__auto_generated_rro_vendor.apk
-overlay/SystemUITitan__tangorpro_beta__auto_generated_rro_vendor.apk
-overlay/TeleService__tangorpro_beta__auto_generated_rro_vendor.apk
-overlay/Traceur__tangorpro_beta__auto_generated_rro_vendor.apk
-overlay/framework-res__tangorpro_beta__auto_generated_rro_vendor.apk
 
 # Symlinks
 lib/modules
@@ -1299,8 +1191,10 @@ lib64/hardware.google.bluetooth.sar@1.0.so
 lib64/hardware.google.bluetooth.sar@1.1.so
 
 # Camera
+lib/libGralloc4Wrapper.so
 lib/libdrm.so
 lib/pixel-power-ext-V1-ndk.so
+lib64/libGralloc4Wrapper.so
 
 # Charger
 etc/res/images/charger/battery_fail.png
@@ -1309,6 +1203,7 @@ etc/res/images/charger/main_font.png
 etc/res/values/charger/animation.txt
 
 # Codec2
+lib/android.hardware.media.bufferpool2-V1-ndk.so
 lib/android.hardware.media.bufferpool2-V2-ndk.so
 lib/android.hardware.media.bufferpool@2.0.so
 lib/android.hardware.media.c2-V1-ndk.so
@@ -1333,6 +1228,7 @@ lib/libstagefright_bufferqueue_helper.so
 lib/libstagefright_omx_utils.so
 lib/libstagefright_xmlparser.so
 lib/libvendorgraphicbuffer.so
+lib64/android.hardware.media.bufferpool2-V1-ndk.so
 lib64/android.hardware.media.bufferpool2-V2-ndk.so
 lib64/android.hardware.media.bufferpool@2.0.so
 lib64/android.hardware.media.c2-V1-ndk.so
@@ -1344,7 +1240,6 @@ lib64/android.hardware.media@1.0.so
 lib64/libavservices_minijail.so
 lib64/libcap.so
 lib64/libcodec2.so
-lib64/libcodec2_aidl.so
 lib64/libcodec2_hal_common.so
 lib64/libcodec2_hidl@1.0.so
 lib64/libcodec2_hidl@1.1.so
@@ -1372,10 +1267,9 @@ lib64/android.hardware.confirmationui@1.0.so
 lib64/libteeui_hal_support.so
 
 # Contexthub
-lib/android.hardware.contexthub-V3-ndk.so
 lib64/android.hardware.contexthub-V3-ndk.so
-lib64/android.hardware.contexthub-V4-ndk.so
 lib64/chre_atoms_log.so
+lib64/chre_metrics_reporter.so
 lib64/chremetrics-cpp.so
 
 # HIDL
@@ -1384,16 +1278,14 @@ lib/libhwbinder.so
 lib64/libhidltransport.so
 lib64/libhwbinder.so
 
-# Json
-lib/libjsoncpp.so
+# Identity credential
+etc/permissions/android.hardware.identity_credential.xml
+lib64/android.hardware.identity-V5-ndk.so
+lib64/android.hardware.identity-support-lib.so
 
 # Nos
-lib64/android.hardware.security.keymint-V3-ndk.so
-lib64/libcppbor.so
-lib64/libcppcose_rkp.so
-lib64/libkeymaster_portable.so
+lib64/libkeymaster4support.so
 lib64/libkeymint_support.so
-lib64/libkeymint_support_V3.so
 lib64/libnos.so
 lib64/libnos_client_citadel.so
 lib64/libnos_datagram.so
@@ -1402,13 +1294,15 @@ lib64/libnos_feature.so
 lib64/libnos_transport.so
 lib64/libnosprotos.so
 lib64/nos_app_avb.so
+lib64/nos_app_identity.so
 lib64/nos_app_keymaster.so
+lib64/nos_app_keymaster_ctdl.so
 lib64/nos_app_weaver.so
 lib64/pixelpowerstats_provider_aidl_interface-cpp.so
 
 # Sensors
 lib/android.frameworks.sensorservice-V1-ndk.so
-lib/android.hardware.sensors-V3-ndk.so
+lib/android.hardware.sensors-V2-ndk.so
 lib/android.hardware.sensors@1.0.so
 lib/android.hardware.sensors@2.0-ScopedWakelock.so
 lib/android.hardware.sensors@2.0.so
@@ -1423,12 +1317,12 @@ lib64/libhidparser.so
 lib/libbinder_trusty.so
 lib/libtrusty.so
 lib64/android.trusty.stats.nw.setter-cpp.so
+lib64/lib_sensor_listener.so
 lib64/libbinder_trusty.so
 lib64/libtrusty_metrics.so
 
 # Misc interfaces
 lib/android.frameworks.stats-V1-ndk.so
-lib/android.frameworks.stats-V2-ndk.so
 lib/android.hardware.graphics.allocator-V2-ndk.so
 lib/android.hardware.graphics.allocator@2.0.so
 lib/android.hardware.graphics.allocator@3.0.so
@@ -1446,6 +1340,7 @@ lib/android.hardware.thermal@2.0.so
 lib/android.hidl.token@1.0-utils.so
 lib/android.hidl.token@1.0.so
 lib/com.google.hardware.pixel.display-V9-ndk.so
+lib64/android.frameworks.sensorservice@1.0.so
 lib64/android.frameworks.stats-V1-cpp.so
 lib64/android.hardware.authsecret-V1-ndk.so
 lib64/android.hardware.biometrics.common-V3-ndk.so
@@ -1455,9 +1350,11 @@ lib64/android.hardware.graphics.bufferqueue@2.0.so
 lib64/android.hardware.health-V1-ndk.so
 lib64/android.hardware.input.common-V1-ndk.so
 lib64/android.hardware.input.processor-V1-ndk.so
+lib64/android.hardware.keymaster-V3-ndk.so
 lib64/android.hardware.keymaster-V4-ndk.so
 lib64/android.hardware.keymaster@3.0.so
 lib64/android.hardware.keymaster@4.0.so
+lib64/android.hardware.keymaster@4.1.so
 lib64/android.hardware.neuralnetworks-V4-ndk.so
 lib64/android.hardware.neuralnetworks@1.0.so
 lib64/android.hardware.neuralnetworks@1.1.so
@@ -1465,6 +1362,7 @@ lib64/android.hardware.neuralnetworks@1.2.so
 lib64/android.hardware.neuralnetworks@1.3.so
 lib64/android.hardware.oemlock-V1-ndk.so
 lib64/android.hardware.weaver-V2-ndk.so
+lib64/android.hardware.wifi-V1-ndk.so
 lib64/android.hidl.token@1.0-utils.so
 lib64/android.hidl.token@1.0.so
 lib64/com.google.hardware.pixel.display-V9-ndk.so
@@ -1479,12 +1377,6 @@ lib/libui.so
 lib64/libevent.so
 lib64/libion.so
 
-# Odex
-framework/oat/arm/com.google.android.camera.experimental2022.odex
-framework/oat/arm/com.google.android.camera.experimental2022.vdex
-framework/oat/arm64/com.google.android.camera.experimental2022.odex
-framework/oat/arm64/com.google.android.camera.experimental2022.vdex
-
 # Completely skip files that are not required
 
 # Edge TPU

tangorpro/Android.bp

@@ -1,11 +0,0 @@
-//
-// SPDX-FileCopyrightText: 2024 The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-prebuilt_etc {
-    name: "init.recovery.tangorpro.touch.rc",
-    src: "init.recovery.touch.rc",
-    sub_dir: "init",
-    recovery: true,
-}

tangorpro/BoardConfig.mk

@@ -15,32 +15,34 @@
 #
 TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := tangorpro
-RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR ?= pdk # Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR)
-$(call soong_config_set,tangorpro_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR))
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
+else
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
+endif
 
 # Enable load module in parallel
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
 # The modules which need to be loaded in sequential
-BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
-TARGET_SCREEN_DENSITY := 320
+
+ifdef PHONE_CAR_BOARD_PRODUCT
+    include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk 
+else
+    TARGET_SCREEN_DENSITY := 320
+endif
+
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_TANGORPRO := true
 BOARD_KERNEL_CMDLINE += swiotlb=noforce
 
 include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
-include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/tangorpro/proprietary/BoardConfigVendor.mk
 include device/google/tangorpro/sepolicy/tangorpro-sepolicy.mk
 include device/google/tangorpro/wifi/BoardConfig-wifi.mk
 
-ifdef PHONE_CAR_BOARD_PRODUCT
-    include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
-endif
-
-DEVICE_PATH := device/google/tangorpro
-VENDOR_PATH := vendor/google/tangorpro
-include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include device/google/tangorpro/tangorpro/BoardConfigLineage.mk

tangorpro/BoardConfigEvolution.mk

@@ -1,6 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-include $(DEVICE_PATH)/BoardConfigEvolution.mk

tangorpro/BoardConfigLineage.mk

@@ -1,9 +1,9 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include $(DEVICE_PATH)/BoardConfigLineage.mk
+include device/google/tangorpro/BoardConfigLineage.mk
 
-include $(VENDOR_PATH)/BoardConfigVendor.mk
+include vendor/google/tangorpro/BoardConfigVendor.mk

tangorpro/device-evolution.mk

@@ -1,8 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
-
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution

tangorpro/device-lineage.mk

@@ -1,13 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
-# SPDX-License-Identifier: Apache-2.0
-#
-
-$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
-
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
-
-# Init
-PRODUCT_PACKAGES += \
-    init.recovery.tangorpro.touch.rc

tangorpro/extract-files.py

@@ -1,94 +0,0 @@
-#!/usr/bin/env -S PYTHONPATH=../../../../tools/extract-utils python3
-#
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-from extract_utils.extract import extract_fns_user_type
-from extract_utils.extract_pixel import (
-    extract_pixel_factory_image,
-    extract_pixel_firmware,
-    pixel_factory_image_regex,
-    pixel_firmware_regex,
-)
-from extract_utils.file import FileArgs, FileList
-from extract_utils.fixups_blob import (
-    blob_fixup,
-    blob_fixups_user_type,
-)
-from extract_utils.fixups_lib import (
-    lib_fixups,
-    lib_fixups_user_type,
-)
-from extract_utils.main import (
-    ExtractUtils,
-    ExtractUtilsModule,
-)
-
-namespace_imports = [
-    'device/google/tangorpro',
-    'hardware/google/av',
-    'hardware/google/gchips',
-    'hardware/google/graphics/common',
-    'hardware/google/interfaces',
-    'hardware/google/pixel',
-]
-
-
-def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
-    return f'{lib}_{partition}' if partition == 'vendor' else None
-
-
-lib_fixups: lib_fixups_user_type = {
-    **lib_fixups,
-    (
-        'com.google.edgetpu_app_service-V3-ndk',
-        'com.google.edgetpu_vendor_service-V2-ndk',
-    ): lib_fixup_vendor_suffix,
-}
-
-blob_fixups: blob_fixups_user_type = {
-    'product/etc/felica/common.cfg': blob_fixup()
-        .patch_file('osaifu-keitai.patch'),
-    'vendor/etc/init/init.modem_logging_control.rc': blob_fixup()
-        .regex_replace(' && property:ro.debuggable=0', ''),
-}  # fmt: skip
-
-extract_fns: extract_fns_user_type = {
-    pixel_factory_image_regex: extract_pixel_factory_image,
-    pixel_firmware_regex: extract_pixel_firmware,
-}
-
-module = ExtractUtilsModule(
-    'tangorpro',
-    'google',
-    device_rel_path='device/google/tangorpro/tangorpro',
-    blob_fixups=blob_fixups,
-    lib_fixups=lib_fixups,
-    namespace_imports=namespace_imports,
-    add_firmware_proprietary_file=True,
-    extract_fns=extract_fns,
-)
-
-
-def fix_vendor_file_list(file_list: FileList):
-    module_suffix_file_paths = [
-        'vendor/lib/com.google.edgetpu_app_service-V3-ndk.so',
-        'vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so',
-        'vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so',
-    ]
-
-    for file_path in module_suffix_file_paths:
-        file_list.get_file(file_path).set_arg(FileArgs.MODULE_SUFFIX, '_vendor')
-
-
-module.add_generated_proprietary_file(
-    'proprietary-files-vendor.txt',
-    partition='vendor',
-    skip_file_list_name='skip-files-vendor.txt',
-    fix_file_list=fix_vendor_file_list,
-)
-
-if __name__ == '__main__':
-    utils = ExtractUtils.device(module)
-    utils.run()

tangorpro/init.recovery.touch.rc

@@ -1,3 +0,0 @@
-on init
-   insmod /lib/modules/goog_touch_interface.ko
-   insmod /lib/modules/nvt_touch.ko

tangorpro/osaifu-keitai.patch

@@ -1,24 +0,0 @@
-From aab255f2807cfc460c0dce40decd5554d49c0076 Mon Sep 17 00:00:00 2001
-From: jabashque <jabashque@gmail.com>
-Date: Mon, 5 Feb 2024 21:36:03 +0000
-Subject: [PATCH 1/1] Enable Osaifu-Keitai on non-Japanese SKUs
-
----
- common.cfg | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/common.cfg b/common.cfg
-index 3b78765..00f53cb 100644
---- a/common.cfg
-+++ b/common.cfg
-@@ -11,6 +11,5 @@
- 02030001,0
- 02030002,0
- 02030003,intent:#Intent;action=android.settings.NFC_SETTINGS;end
--00000014,content://com.google.android.pixelnfc.provider.DeviceInfoContentProvider/isJapanSku
--00000015,is_japan_sku
- 00000016,0001
-+00000018,1
--- 
-2.47.0
-

tangorpro/overlay/frameworks/base/core/res/res/values/dimens.xml

@@ -23,8 +23,8 @@
     <dimen name="rounded_corner_radius_top">28px</dimen>
     <dimen name="rounded_corner_radius_bottom">27px</dimen>
 
-    <!-- Default paddings for content around the corners. -->
-    <dimen name="rounded_corner_content_padding">12dp</dimen>
+    <!-- for 20dp of padding at 3.5px/dp at default density -->
+    <dimen name="rounded_corner_content_padding">28px</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">3px</dimen>

tangorpro/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml

@@ -16,12 +16,6 @@
 */
 -->
 <resources>
-    <!-- the padding on the start of the statusbar -->
-    <dimen name="status_bar_padding_start">0dp</dimen>
-
-    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
-    <dimen name="ongoing_appops_dot_min_padding">12dp</dimen>
-
     <!-- Location on the screen of the center of the fingerprint sensor. -->
     <dimen name="physical_fingerprint_sensor_center_screen_location_x">0px</dimen>
     <dimen name="physical_fingerprint_sensor_center_screen_location_y">160px</dimen>

tangorpro/setup-makefiles.py

@@ -1 +0,0 @@
-#!./extract-files.py --regenerate_makefiles

thermal_info_config_charge_tangorpro.json

@@ -8,18 +8,21 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "35.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"charger_skin_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "39.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -27,12 +30,14 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000
@@ -40,6 +45,7 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {

thermal_info_config_tangorpro.json

@@ -4,6 +4,7 @@
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "50.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -11,12 +12,14 @@
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"charger_skin_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "39.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -25,6 +28,7 @@
             "Name":"disp_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -38,6 +42,7 @@
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000
@@ -45,6 +50,7 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
+            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -337,28 +343,351 @@
             "Name":"ISP",
             "Type":"NPU",
             "Multiplier":0.001
+        },
+        {
+            "Name":"battery_cycle",
+            "Type":"BCL_VOLTAGE",
+            "Multiplier":1
+        },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "vdroop1",
+            "Combination":["battery", "battery_cycle", "vdroop1"],
+            "Coefficient":[-10000, 400, 1000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"],
+            "Multiplier":1,
+            "Monitor":true
+        },
+        {
+            "Name":"FLASH_LED_REDUCE",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "vdroop1",
+            "Combination":["battery", "battery_cycle", "vdroop1"],
+            "Coefficient":[-10000, 400, 1000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "SendPowerHint":true
+        },
+        {
+            "Name":"soc",
+            "Type":"BCL_PERCENTAGE",
+            "HotThreshold":["NAN", "NAN", 70, "NAN", "NAN", "NAN", "NAN"],
+            "Multiplier":1
+        },
+        {
+            "Name":"BCL_TPU_LOW_TEMP",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "TriggerSensor": "ocp_tpu",
+            "Combination":["ocp_tpu", "battery"],
+            "Coefficient":[1, -10],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_GPU_LOW_TEMP",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "TriggerSensor": "ocp_gpu",
+            "Combination":["ocp_gpu", "battery"],
+            "Coefficient":[1, -10],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_BATOILO_GPU_LOW_TEMP",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "batoilo",
+            "Combination":["batoilo", "ocp_gpu", "battery"],
+            "Coefficient":[5000, 12000, -1000 ],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN",  3.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_BATOILO_TPU_LOW_TEMP",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "batoilo",
+            "Combination":["batoilo", "ocp_tpu", "battery"],
+            "Coefficient":[5000, 12000, -1000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_BATOILO_GPU",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "batoilo",
+            "Combination":["batoilo", "ocp_gpu"],
+            "Coefficient":[5000, 12000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_BATOILO_TPU",
+            "Type":"BCL_CURRENT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "batoilo",
+            "Combination":[
+                "batoilo",
+                "ocp_tpu"
+            ],
+            "Coefficient":[5000, 12000],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
+                }
+            ]
+        },
+        {
+            "Name":"batoilo",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Monitor":true,
+            "PollingDelay":0,
+            "PassiveDelay":60000,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-cpufreq-2",
+                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
+                },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
+                }
+            ]
+        },
+        {
+            "Name":"BCL_AUDIO_BAACL",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "soc",
+            "Combination":["battery", "soc"],
+            "Coefficient":[-45000, 70],
+            "HotThreshold":["NAN", "NAN",  "NAN", "NAN", 2.0, "NAN", "NAN"],
+            "Multiplier":1,
+            "Monitor":true
+        },
+        {
+            "Name":"vdroop1",
+            "Type":"BCL_VOLTAGE",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Monitor":true,
+            "PollingDelay":0,
+            "PassiveDelay":60000,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-cpufreq-2",
+                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+                },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+                }
+            ]
+        },
+        {
+            "Name":"vdroop2",
+            "Type":"BCL_VOLTAGE",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Monitor":true,
+            "PollingDelay":0,
+            "PassiveDelay":60000,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-cpufreq-2",
+                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
+                },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+                }
+            ]
+        },
+        {
+            "Name":"smpl_gm",
+            "Type":"BCL_VOLTAGE",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Monitor":true,
+            "PollingDelay":0,
+            "PassiveDelay":60000,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-cpufreq-2",
+                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
+                },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+                }
+            ]
+        },
+        {
+            "Name":"ocp_cpu1",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Hidden":true
+        },
+        {
+            "Name":"ocp_cpu2",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Hidden":true
+        },
+        {
+            "Name":"ocp_tpu",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Hidden":true
+        },
+        {
+            "Name":"ocp_gpu",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Hidden":true
+        },
+        {
+            "Name":"soft_ocp_cpu2",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Hidden":true
+        },
+        {
+            "Name":"soft_ocp_cpu1",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Hidden":true
+        },
+        {
+            "Name":"soft_ocp_tpu",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Hidden":true
+        },
+        {
+            "Name":"soft_ocp_gpu",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
+            "Multiplier":1,
+            "Hidden":true
         }
     ],
     "CoolingDevices":[
         {
             "Name":"thermal-cpufreq-0",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
+            "State2Power":[1100, 1050, 1000, 950, 900, 850, 800, 750, 700, 650, 600]
         },
         {
             "Name":"thermal-cpufreq-1",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
+            "State2Power":[1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
         },
         {
             "Name":"thermal-cpufreq-2",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
+            "State2Power":[1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
         },
         {
             "Name":"thermal-gpufreq-0",
             "Type":"GPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
+            "State2Power":[4371, 3543, 3085, 2293, 1927, 1707, 1394, 1171, 967, 768, 592, 433]
         },
         {
             "Name":"tpu_cooling",

vendor.prop

@@ -2,5 +2,8 @@
 drm.service.enabled=true
 media.mediadrmservice.enable=true
 
+# SSR
+vendor.debug.ssrdump.type=sscoredump
+
 # UWB
 ro.vendor.uwb.calibration.calibrationpaths=/vendor/etc/uwb/calib_paths