tangorpro: Initialize for Evolution X 10.x

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

.gitupstream

@@ -0,0 +1 @@
+https://android.googlesource.com/device/google/tangorpro

AndroidProducts.mk

@@ -17,7 +17,8 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_tangorpro.mk \
     $(LOCAL_DIR)/aosp_tangorpro_hwasan.mk \
-    $(LOCAL_DIR)/factory_tangorpro.mk
+    $(LOCAL_DIR)/factory_tangorpro.mk \
+    $(LOCAL_DIR)/lineage_tangorpro.mk
 
 COMMON_LUNCH_CHOICES := \
     aosp_tangorpro-trunk_staging-userdebug

BoardConfigEvolution.mk

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

BoardConfigLineage.mk

@@ -0,0 +1,11 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# 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=file:device/google/gs-common:main:/OWNERS
+per-file *.mk,*/BoardConfig.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS

USI_Stylus.idc

@@ -0,0 +1,4 @@
+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-headset-microphones">
+  <path name="usb-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,6 +1420,14 @@
     <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/audio-tables.mk

@@ -81,7 +81,7 @@ PRODUCT_COPY_FILES += \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_external_speaker_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_external_speaker_config.pb
 
 # userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
     device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \

audio/tangorpro/config/audio_platform_configuration.xml

@@ -254,6 +254,7 @@
         <feature name="SoundTriggerDockTuning"/>
         <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:WholeSpeaker"/>
         <feature name="Apmg3"/>
+        <!--feature name="Pokebowl"/-->
     </features>
 
     <cfg_attr>
@@ -292,6 +293,7 @@
         <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>
@@ -312,6 +314,7 @@
         <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,10 +136,6 @@
                 </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">
@@ -152,8 +148,6 @@
                 </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 -->
@@ -161,8 +155,6 @@
                 </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"
@@ -195,7 +187,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"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output,immersive_out"/>
                 <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,10 +136,6 @@
                 </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">
@@ -152,8 +148,6 @@
                 </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 -->
@@ -161,8 +155,6 @@
                 </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,10 +132,6 @@
                 </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">
@@ -146,8 +142,6 @@
                 </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 -->
@@ -155,8 +149,6 @@
                 </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

@@ -16,7 +16,7 @@
 #
 
 # Override BQR mask to enable LE Audio Choppy report
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=262238
 else
@@ -54,13 +54,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
 DEVICE_MANIFEST_FILE += \
        device/google/tangorpro/bluetooth/manifest_bluetooth.xml
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/bluetooth/device_framework_matrix_product.xml
-BOARD_SEPOLICY_DIRS += device/google/tangorpro-sepolicy/bluetooth
+BOARD_SEPOLICY_DIRS += device/google/tangorpro/sepolicy/bluetooth
 PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.synabtlinux \
         android.hardware.bluetooth.prebuilt.xml \
         android.hardware.bluetooth_le.prebuilt.xml
 
 # Bluetooth SAR test tools
-PRODUCT_PACKAGES_DEBUG += bt_sar_test
+PRODUCT_PACKAGES_ENG += bt_sar_test
 
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \

cast_auth/mediadrm/Android.bp

@@ -1,48 +0,0 @@
-
-// ----------------------------------------------------------------------------
-// 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

@@ -1,17 +0,0 @@
-#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

@@ -1,82 +0,0 @@
-#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

@@ -1,419 +0,0 @@
-#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

@@ -1,23 +0,0 @@
-#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

@@ -1,39 +0,0 @@
-#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

@@ -1,6 +0,0 @@
-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

@@ -1,48 +0,0 @@
-#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

@@ -1,20 +0,0 @@
-#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

@@ -1,50 +0,0 @@
-#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

@@ -1,143 +0,0 @@
-#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

@@ -1,28 +0,0 @@
-#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

@@ -1,44 +0,0 @@
-#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

@@ -1,7 +0,0 @@
-<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/etc/init.insmod.tangorpro.cfg
+service insmod_sh_tangorpro /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.tangorpro.cfg
     class main
     user root
     group root system

device-evolution.mk

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

device-lineage.mk

@@ -0,0 +1,41 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage
+
+# ANGLE - Almost Native Graphics Layer Engine
+PRODUCT_PACKAGES += \
+    ANGLE
+
+# GMS
+WITH_GMS_COMMS_SUITE := false
+
+# RRO
+PRODUCT_PACKAGES += \
+    GrilRadioCustomizableNoRadio \
+    SettingsGoogleTangorproOverlay \
+    TangorproGMSOverlay \
+    TitanSettingsOverlay \
+    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

device-tangorpro.mk

@@ -14,18 +14,13 @@
 # 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)
 
-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
+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
 
 BOARD_WITHOUT_RADIO := true
 
@@ -62,7 +57,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/gti.mk
+include device/google/gs-common/touch/gti/predump_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
@@ -82,7 +77,8 @@ 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/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
 
 # Init files
 PRODUCT_COPY_FILES += \
@@ -92,9 +88,13 @@ 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
+# 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),)
 PRODUCT_COPY_FILES += \
-	device/google/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.tangorpro.cfg
+	device/google/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.tangorpro.cfg
+endif
 
 # Camera
 PRODUCT_COPY_FILES += \
@@ -132,6 +132,10 @@ 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
 
@@ -171,13 +175,6 @@ 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 += \
@@ -219,11 +216,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
         libcast_auth
 
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
         test_cast_auth
 
 # USI stylus test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
         usi_test
 
 # Lights HAL
@@ -266,10 +263,6 @@ 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 \
@@ -283,12 +276,32 @@ 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
+    persist.vendor.camera.raise_buf_allocation_priority=1 \
+    camera.enable_landscape_to_portrait=true
 
 # 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
@@ -310,3 +323,8 @@ 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

@@ -0,0 +1,11 @@
+[
+  {
+    "repository": "device_google_gs201",
+    "target_path": "device/google/gs201"
+  },
+  {
+    "repository": "device/google/tangorpro-kernels/6.1",
+    "target_path": "device/google/tangorpro-kernels/6.1",
+    "remote": "aosp-tangorpro"
+  }
+]

extract-files.py

@@ -0,0 +1,13 @@
+#!/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

lineage_tangorpro.mk

@@ -0,0 +1,35 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# 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/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)
+
+# Device identifier. This must come after all inclusions
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Pixel Tablet
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+
+# 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)
+
+$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)

manifest.xml

@@ -48,15 +48,6 @@
             <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

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

modules.load.vendor_kernel_boot

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

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

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2022, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources 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
+         with different orientations.  Since we cannot always tell these docks
+         apart and the docks cannot report their true orientation on their own,
+         we rely on gravity to determine the effective orientation. -->
+    <bool name="config_deskDockEnablesAccelerometer">false</bool>
+
+    <!-- Control whether nosensor and locked orientation requests are respected from the app when
+         config_deskDockEnablesAccelerometer is set to false.
+         TODO(b/274763533): Consider making true by default and removing this. -->
+    <bool name="config_deskRespectsNoSensorAndLockedWithoutAccelerometer">true</bool>
+
+    <!-- Allow the gesture to quick tap the power button multiple times to start the emergency sos
+         experience while the device is non-interactive. -->
+    <bool name="config_emergencyGestureEnabled">false</bool>
+
+    <!-- Whether the geolocation time zone detection feature is enabled. Setting this to false means
+         the feature cannot be used. Setting this to true means system server components can be
+         tested and location time zone detection may be used if other configuration allows (see
+         location time zone provider configuration settings below). -->
+    <bool name="config_enableGeolocationTimeZoneDetection">false</bool>
+
+    <!-- Default value for performant auth feature. -->
+    <bool name="config_performantAuthDefault">true</bool>
+
+    <!-- Whether the vendor power press code need to be mapped. -->
+    <bool name="config_powerPressMapping">true</bool>
+
+    <!-- If true, the direction rotation is applied to get to an application's requested
+         orientation is reversed.  Normally, the model is that landscape is
+         clockwise from portrait; thus on a portrait device an app requesting
+         landscape will cause a clockwise rotation, and on a landscape device an
+         app requesting portrait will cause a counter-clockwise rotation.  Setting
+         true here reverses that logic. -->
+    <bool name="config_reverseDefaultRotation">true</bool>
+
+    <!-- Whether changing sensor privacy SW setting requires device to be unlocked -->
+    <bool name="config_sensorPrivacyRequiresAuthentication">false</bool>
+
+    <!-- The number of degrees to rotate the display when the device is in a desk dock.
+         A value of -1 means no change in orientation by default. -->
+    <integer name="config_deskDockRotation">270</integer>
+
+    <!-- Amount of time in ms the user needs to press the relevant key to bring up the
+         global actions dialog -->
+    <integer name="config_globalActionsKeyTimeout">750</integer>
+
+    <!-- The time in milliseconds after which a press on power button is considered "long". -->
+    <integer name="config_longPressOnPowerDurationMs">750</integer>
+
+    <!-- Power press vendor code. -->
+    <integer name="config_powerPressCode">19</integer>
+
+    <!-- Whether a camera compat controller is enabled to allow the user to apply or revert
+         treatment for stretched issues in camera viewfinder. -->
+    <bool name="config_isCameraCompatControlForStretchedIssuesEnabled">true</bool>
+
+    <!-- Whether sending compat fake focus for split screen resumed activities is enabled.
+         Needed because some game engines wait to get focus before drawing the content of
+         the app which isn't guaranteed by default in multi-window modes. -->
+    <bool name="config_isCompatFakeFocusEnabled">true</bool>
+
+    <!-- Whether camera compat treatment is enabled for issues caused by orientation mismatch
+        between camera buffers and an app window. This includes force rotation of fixed
+        orientation activities connected to the camera in fullscreen and showing a tooltip in
+        split screen. -->
+    <bool name="config_isWindowManagerCameraCompatTreatmentEnabled">true</bool>
+
+    <!-- Whether enabling rotation compat policy for immersive apps that prevents auto rotation
+         into non-optimal screen orientation while in fullscreen. This is needed because immersive
+         apps, such as games, are often not optimized for all orientations and can have a poor UX
+         when rotated. Additionally, some games rely on sensors for the gameplay so users can
+         trigger such rotations accidentally when auto rotation is on.
+         Applicable only if ignoreOrientationRequest is enabled. -->
+    <bool name="config_letterboxIsDisplayRotationImmersiveAppCompatPolicyEnabled">true</bool>
+
+    <!-- Whether displaying letterbox education is enabled for letterboxed fullscreen apps. -->
+    <bool name="config_letterboxIsEducationEnabled">true</bool>
+
+    <!-- Whether the specific behaviour for translucent activities letterboxing is enabled.
+         TODO(b/255532890) Enable when ignoreOrientationRequest is set -->
+    <bool name="config_letterboxIsEnabledForTranslucentActivities">true</bool>
+
+    <!-- Whether horizontal reachability repositioning is allowed for letterboxed fullscreen apps.
+    -->
+    <bool name="config_letterboxIsHorizontalReachabilityEnabled">true</bool>
+
+    <!-- Whether should ignore app requested orientation in response to an app
+         calling Activity#setRequestedOrientation. See
+         LetterboxUiController#shouldIgnoreRequestedOrientation for details. -->
+    <bool name="config_letterboxIsPolicyForIgnoringRequestedOrientationEnabled">true</bool>
+
+    <!-- Whether using split screen aspect ratio as a default aspect ratio for unresizable apps. -->
+    <bool name="config_letterboxIsSplitScreenAspectRatioForUnresizableAppsEnabled">true</bool>
+
+    <!-- Whether vertical reachability repositioning is allowed for letterboxed fullscreen apps. -->
+    <bool name="config_letterboxIsVerticalReachabilityEnabled">true</bool>
+
+    <!-- If true, show multiuser switcher by default unless the user specifically disables it. -->
+    <bool name="config_showUserSwitcherByDefault">true</bool>
+
+    <!-- Control the behavior when the user short presses the power button.
+            0 - Nothing
+            1 - Go to sleep (doze)
+            2 - Really go to sleep (don't doze)
+            3 - Really go to sleep and go home (don't doze)
+            4 - Go to home
+            5 - Dismiss IME if shown. Otherwise go to home
+    -->
+    <integer name="config_shortPressOnPowerBehavior">7</integer>
+
+    <!--  Maximum number of supported users -->
+    <integer name="config_multiuserMaximumUsers">8</integer>
+
+    <!-- Corners radius for activity presented the letterbox mode. Values < 0 enable rounded
+         corners with radius equal to min between device bottom corner radii. Default 0 value turns
+         off rounded corners logic in LetterboxUiController. -->
+    <integer name="config_letterboxActivityCornersRadius">-1</integer>
+
+    <!-- Aspect ratio of letterboxing for fixed orientation. Values <= 1.0 will be ignored.
+         Note: Activity min/max aspect ratio restrictions will still be respected.
+         Therefore this override can control the maximum screen area that can be occupied by
+         the app in the letterbox mode. -->
+    <item name="config_fixedOrientationLetterboxAspectRatio" format="float" type="dimen">1.33</item>
+
+    <!-- Vertical position of a center of the letterboxed app window.
+        0 corresponds to the upper side of the screen and 1 to the lower side. If given value < 0
+        or > 1 it is ignored and for non-tabletop mode central position is used (0.5); for
+         tabletop mode top (0.0) is used. -->
+    <item name="config_letterboxVerticalPositionMultiplier" format="float" type="dimen">0.5</item>
+
+    <!-- Control whether to start dream immediately upon docking even if the lockscreen is unlocked.
+         This defaults to true to be consistent with historical behavior. -->
+    <bool name="config_startDreamImmediatelyOnDock">false</bool>
+
+    <!-- Docking is a uiMode configuration change and will cause activities to relaunch if it's not
+         handled. If true, the configuration change will be sent but activities will not be
+         relaunched upon docking. Apps with desk resources will behave like normal, since they may
+         expect the relaunch upon the desk uiMode change. -->
+    <bool name="config_skipActivityRelaunchWhenDocking">true</bool>
+
+    <!-- If this is true, then keep dreaming when unplugging.
+         This config was formerly known as config_keepDreamingWhenUndocking.
+         It has been updated to affect other plug types. -->
+    <bool name="config_keepDreamingWhenUnplugging">true</bool>
+
+    <!-- Whether to send a user activity event to PowerManager when a dream quits unexpectedly so
+         that the screen won't immediately shut off.
+
+         When a dream stops unexpectedly, such as due to an app update, if the device has been
+         inactive less than the user's screen timeout, the device goes to keyguard and times out
+         back to dreaming after a few seconds. If the device has been inactive longer, the screen
+         will immediately turn off. With this flag on, the device will go back to keyguard in all
+         scenarios rather than turning off, which gives the device a chance to start dreaming
+         again. -->
+    <bool name="config_resetScreenTimeoutOnUnexpectedDreamExit">true</bool>
+
+    <!-- Whether to automatically switch to the designated Dock User (the user chosen for
+         displaying dreams, etc.) after a timeout when the device is docked.  -->
+    <bool name="config_enableTimeoutToDockUserWhenDocked">true</bool>
+
+    <!-- Whether there is to be a chosen Dock User who is the only user allowed to dream. -->
+    <bool name="config_dreamsOnlyEnabledForDockUser">true</bool>
+
+    <!-- If supported, are dreams enabled? (by default) -->
+    <bool name="config_dreamsEnabledByDefault">false</bool>
+
+    <!-- Whether dreams are disabled when ambient mode is suppressed. -->
+    <bool name="config_dreamsDisabledByAmbientModeSuppressionConfig">true</bool>
+
+    <!-- Default value for Settings.ASSIST_TOUCH_GESTURE_ENABLED -->
+    <bool name="config_assistTouchGestureEnabledDefault">false</bool>
+
+    <!-- The list of supported dream complications -->
+    <integer-array name="config_supportedDreamComplications">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+    </integer-array>
+
+    <!-- Mapping to select an Intent.EXTRA_DOCK_STATE value from extcon state
+         key-value pairs. Each entry is evaluated in order and is of the form:
+            "[EXTRA_DOCK_STATE value],key1=value1,key2=value2[,...]"
+         An entry with no key-value pairs is valid and can be used as a wildcard.
+     -->
+    <string-array name="config_dockExtconStateMapping">
+        <item>4,USB=1</item>
+        <item>3</item>
+    </string-array>
+</resources>

overlay-lineage/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2009, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources>
+    <bool name="def_accelerometer_rotation">true</bool>
+</resources>

powerhint.json

@@ -863,6 +863,12 @@
       "Duration": 33,
       "Value": "1014000"
     },
+    {
+      "PowerHint": "CPU_LOAD_RESET",
+      "Node": "TAPreferHighCap",
+      "Duration": 33,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "MemFreq",
@@ -1632,18 +1638,6 @@
       "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",
@@ -1881,16 +1875,28 @@
       "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
+      "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
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1910,9 +1916,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
     },
@@ -1934,9 +1940,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
     },
@@ -1958,9 +1964,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
     }

rro_overlays/UwbOverlay/res/values/config.xml

@@ -63,4 +63,10 @@
     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>

rro_overlays/WifiOverlay/res/values/config.xml

@@ -119,12 +119,6 @@
         is when the system is in the suspended mode -->
     <bool translatable="false" name="config_wifiDtimMultiplierConfigEnabled">true</bool>
 
-    <!-- Indicate whether the verbose logging is always on -->
-    <!-- 0: verbose logging controlled by user
-         1: verbose logging on by default for userdebug
-         2: verbose logging on by default for all builds -->
-    <integer translatable="false" name="config_wifiVerboseLoggingAlwaysOnLevel">1</integer>
-
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>

sepolicy/.gitupstream

@@ -0,0 +1 @@
+https://android.googlesource.com/device/google/tangorpro-sepolicy

sepolicy/OWNERS

@@ -0,0 +1,4 @@
+include device/google/gs-common:/sepolicy/OWNERS
+
+adamshih@google.com
+

sepolicy/bluetooth/file_contexts

@@ -0,0 +1,4 @@
+# Bluetooth
+/vendor/bin/hw/android\.hardware\.bluetooth@1\.1-service\.synabtlinux    u:object_r:hal_bluetooth_synabtlinux_exec:s0
+
+/dev/ttySAC18                                   u:object_r:hci_attach_dev:s0

sepolicy/bluetooth/genfs_contexts

@@ -0,0 +1,4 @@
+genfscon sysfs /devices/platform/odm/odm:btbcm/rfkill/rfkill0/state                             u:object_r:sysfs_bluetooth_writable:s0
+genfscon sysfs /devices/platform/odm/odm:btbcm/rfkill/rfkill2/state                             u:object_r:sysfs_bluetooth_writable:s0
+genfscon proc /bluetooth/sleep/btwrite                                                          u:object_r:proc_bluetooth_writable:s0
+genfscon proc /bluetooth/sleep/lpm                                                              u:object_r:proc_bluetooth_writable:s0

sepolicy/bluetooth/hal_bluetooth_default.te

@@ -0,0 +1,23 @@
+type hal_bluetooth_synabtlinux, domain;
+type hal_bluetooth_synabtlinux_exec, exec_type, file_type, vendor_file_type;
+
+hal_server_domain(hal_bluetooth_synabtlinux, hal_bluetooth)
+init_daemon_domain(hal_bluetooth_synabtlinux)
+
+allow hal_bluetooth_synabtlinux self:socket { create bind read write };
+allow hal_bluetooth_synabtlinux self:bluetooth_socket { create bind read write };
+allow hal_bluetooth_synabtlinux hci_attach_dev:chr_file rw_file_perms;
+allow hal_bluetooth_synabtlinux hal_power_stats_vendor_service:service_manager find;
+add_hwservice(hal_bluetooth_synabtlinux, hal_bluetooth_coexistence_hwservice)
+vndbinder_use(hal_bluetooth_synabtlinux)
+binder_call(hal_bluetooth_synabtlinux, hal_power_stats_default)
+get_prop(hal_bluetooth_synabtlinux, boot_status_prop)
+
+allow hal_bluetooth_synabtlinux sscoredump_vendor_data_crashinfo_file:dir create_dir_perms;
+allow hal_bluetooth_synabtlinux sscoredump_vendor_data_crashinfo_file:file create_file_perms;
+
+ userdebug_or_eng(`
+  allow hal_bluetooth_synabtlinux logbuffer_device:chr_file r_file_perms;
+  allow hal_bluetooth_synabtlinux sscoredump_vendor_data_coredump_file:dir create_dir_perms;
+  allow hal_bluetooth_synabtlinux sscoredump_vendor_data_coredump_file:file create_file_perms;
+ ')

sepolicy/bluetooth/hwservice.te

@@ -0,0 +1,2 @@
+# Bluetooth HAL extension
+type hal_bluetooth_coexistence_hwservice, hwservice_manager_type, vendor_hwservice_type;

sepolicy/bluetooth/hwservice_contexts

@@ -0,0 +1,3 @@
+# Bluetooth HAL extension
+hardware.google.bluetooth.bt_channel_avoidance::IBTChannelAvoidance   u:object_r:hal_bluetooth_coexistence_hwservice:s0
+hardware.google.bluetooth.sar::IBluetoothSar                          u:object_r:hal_bluetooth_coexistence_hwservice:s0

sepolicy/fingerprint_capacitance/file.te

@@ -0,0 +1 @@
+type sysfs_fingerprint, sysfs_type, fs_type;

sepolicy/fingerprint_capacitance/file_contexts

@@ -0,0 +1 @@
+/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.fpc42    u:object_r:hal_fingerprint_capacitance_exec:s0

sepolicy/fingerprint_capacitance/genfs_contexts

@@ -0,0 +1 @@
+genfscon sysfs /devices/platform/odm/odm:fp_fpc1020     u:object_r:sysfs_fingerprint:s0

sepolicy/fingerprint_capacitance/hal_fingerprint_capacitance.te

@@ -0,0 +1,39 @@
+# hal_fingerprint_capacitance definition
+type hal_fingerprint_capacitance, domain;
+hal_server_domain(hal_fingerprint_capacitance, hal_fingerprint)
+
+type hal_fingerprint_capacitance_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(hal_fingerprint_capacitance)
+
+set_prop(hal_fingerprint_capacitance, vendor_fingerprint_prop)
+
+# allow fingerprint to access file
+allow hal_fingerprint_capacitance fingerprint_device:chr_file rw_file_perms;
+allow hal_fingerprint_capacitance tee_device:chr_file rw_file_perms;
+allow hal_fingerprint_capacitance sysfs_fingerprint:dir r_dir_perms;
+allow hal_fingerprint_capacitance sysfs_fingerprint:file rw_file_perms;
+
+# allow fingerprint to access power hal
+hal_client_domain(hal_fingerprint_capacitance, hal_power);
+
+# allow fingerprint to find fwk service
+allow hal_fingerprint_capacitance fwk_stats_service:service_manager find;
+
+# allow fingerprint to access sysfs_leds
+allow hal_fingerprint_capacitance sysfs_leds:dir search;
+allow hal_fingerprint_capacitance sysfs_leds:file rw_file_perms;
+
+# allow fingerprint to access sysfs_batteryinfo
+allow hal_fingerprint_capacitance sysfs_batteryinfo:dir search;
+allow hal_fingerprint_capacitance sysfs_batteryinfo:file rw_file_perms;
+
+# allow fingerprint to access input_device
+allow hal_fingerprint_capacitance input_device:dir r_dir_perms;
+allow hal_fingerprint_capacitance input_device:chr_file rw_file_perms;
+
+# allow fingerprint to access hwservice
+hwbinder_use(hal_fingerprint_capacitance)
+add_hwservice(hal_fingerprint_capacitance, hal_fingerprint_capacitance_ext_hwservice)
+
+# allow fingerprint to access fwk sensor hwservice
+allow hal_fingerprint_capacitance fwk_sensor_service:service_manager find;

sepolicy/fingerprint_capacitance/hwservice.te

@@ -0,0 +1 @@
+type hal_fingerprint_capacitance_ext_hwservice, hwservice_manager_type;

sepolicy/fingerprint_capacitance/hwservice_contexts

@@ -0,0 +1,2 @@
+com.fingerprints42.extension::IFingerprintEngineering  u:object_r:hal_fingerprint_capacitance_ext_hwservice:s0
+com.fingerprints42.extension::IFingerprintSensorTest   u:object_r:hal_fingerprint_capacitance_ext_hwservice:s0

sepolicy/fingerprint_capacitance/servicemanager.te

@@ -0,0 +1 @@
+binder_call(servicemanager, hal_fingerprint_capacitance)

sepolicy/fingerprint_capacitance/system_app.te

@@ -0,0 +1,3 @@
+# TODO (b/264266705) Remove this and make it specific to the app
+# allow SystemUIGoogle to access fingerprint hal
+hal_client_domain(system_app, hal_fingerprint)

sepolicy/system_ext/private/platform_app.te

@@ -0,0 +1,2 @@
+# Allow platform apps to access system_update_service (e.g. check if update info is available).
+allow platform_app system_update_service:service_manager find;

sepolicy/system_ext/private/property_contexts

@@ -0,0 +1,6 @@
+# TODO(b/246793311): Clean up a temporary property once pa/2342172 lands
+debug.sf.ignore_hwc_physical_display_orientation u:object_r:surfaceflinger_prop:s0 exact bool
+
+# Default orienation for boot animation counted from natural orienation of the device
+# Id at the end corresponds to the display id on the device. See b/246793311 for context.
+ro.bootanim.set_orientation_4619827677550801152 u:object_r:surfaceflinger_prop:s0 exact enum ORIENTATION_0 ORIENTATION_90 ORIENTATION_180 ORIENTATION_270

sepolicy/tangorpro-sepolicy.mk

@@ -0,0 +1,9 @@
+# sepolicy that are shared among devices using whitechapel
+BOARD_SEPOLICY_DIRS += device/google/tangorpro/sepolicy/vendor
+BOARD_SEPOLICY_DIRS += device/google/tangorpro/sepolicy/tracking_denials
+
+# fingerprint
+BOARD_SEPOLICY_DIRS += device/google/tangorpro/sepolicy/fingerprint_capacitance
+
+# system_ext
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/tangorpro/sepolicy/system_ext/private

sepolicy/tracking_denials/README.txt

@@ -0,0 +1,2 @@
+This folder stores known errors detected by PTS. Be sure to remove relevant
+files to reproduce error log on latest ROMs.

sepolicy/tracking_denials/bug_map

@@ -0,0 +1,3 @@
+platform_app system_data_file dir b/289358324
+shell sysfs_touch dir b/264823366
+system_app proc_pagetypeinfo file b/312375728

sepolicy/vendor/README.txt

@@ -0,0 +1,2 @@
+This folder holds sepolicy exclusively for one device. For example, genfs_contexts
+paths that are affected by device tree.

sepolicy/vendor/device.te

@@ -0,0 +1,2 @@
+# Wifi
+type vendor_wlan_device, dev_type;

sepolicy/vendor/file.te

@@ -0,0 +1,5 @@
+#Pogo USB control & status
+type sysfs_pogo_usb, sysfs_type, fs_type;
+
+# Avoid GPS se failed
+type sysfs_gps, sysfs_type, fs_type;

sepolicy/vendor/file_contexts

@@ -0,0 +1,11 @@
+# Devices
+/dev/lwis-eeprom-smaug-front                                                u:object_r:lwis_device:s0
+/dev/lwis-eeprom-smaug-rear                                                 u:object_r:lwis_device:s0
+/dev/lwis-sensor-medusa-front                                               u:object_r:lwis_device:s0
+/dev/lwis-sensor-medusa-rear                                                u:object_r:lwis_device:s0
+
+# Wifi
+/dev/wlan                               u:object_r:vendor_wlan_device:s0
+
+# Privacy LED
+/vendor/bin/hw/android\.hardware\.lights-service\.tangorpro          u:object_r:hal_light_default_exec:s0

sepolicy/vendor/genfs_contexts

@@ -0,0 +1,23 @@
+# Dock
+genfscon sysfs /devices/platform/google,dock/power_supply/dock         u:object_r:sysfs_batteryinfo:s0
+
+# Touch
+genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0   u:object_r:sysfs_touch:s0
+
+# 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
+
+# Pogo usb control & status
+genfscon sysfs /devices/platform/google,pogo/pogo_usb_active           u:object_r:sysfs_pogo_usb:s0
+genfscon sysfs /devices/platform/google,pogo/pogo_usb_capable          u:object_r:sysfs_pogo_usb:s0
+genfscon sysfs /devices/platform/google,pogo/pogo_docked               u:object_r:sysfs_pogo_usb:s0
+genfscon sysfs /devices/platform/google,pogo/equal_priority            u:object_r:sysfs_pogo_usb:s0
+genfscon sysfs /devices/platform/google,pogo/move_data_to_usb          u:object_r:sysfs_pogo_usb:s0
+genfscon sysfs /devices/platform/google,pogo/extcon                    u:object_r:sysfs_extcon:s0
+genfscon sysfs /devices/platform/google,pogo/hall1_s                   u:object_r:sysfs_pogo_usb:s0
+genfscon sysfs /devices/platform/google,pogo/hall1_n                   u:object_r:sysfs_pogo_usb:s0
+genfscon sysfs /devices/platform/google,pogo/hall2_s                   u:object_r:sysfs_pogo_usb:s0

sepolicy/vendor/grilservice_app.te

@@ -0,0 +1,2 @@
+# setBluetoothModeBasedTxPowerCap for SAR
+binder_call(grilservice_app, hal_bluetooth_synabtlinux)

sepolicy/vendor/hal_health_default.te

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

sepolicy/vendor/hal_lights.te

@@ -0,0 +1,7 @@
+allow hal_light_default sysfs_leds:dir search;
+allow hal_light_default sysfs_leds:file rw_file_perms;
+allow hal_light_default mnt_vendor_file:dir search;
+allow hal_light_default persist_file:dir search;
+allow hal_light_default hal_pixel_display_service:service_manager find;
+binder_call(hal_light_default, hal_graphics_composer_default);
+r_dir_file(hal_light_default, persist_leds_file);

sepolicy/vendor/hal_power_stats_default.te

@@ -0,0 +1,2 @@
+# getStateResidency AIDL callback for Bluetooth HAL
+binder_call(hal_power_stats_default, hal_bluetooth_synabtlinux)

sepolicy/vendor/hal_sensors_default.te

@@ -0,0 +1,9 @@
+#
+# USF sensor HAL SELinux type enforcements.
+#
+
+# Allow sensor HAL to access pogo driver hall file node.
+allow hal_sensors_default sysfs_pogo_usb:file rw_file_perms;
+
+# Allow access to the uhid devices.
+allow hal_sensors_default uhid_device:chr_file rw_file_perms;

sepolicy/vendor/hal_usb_impl.te

@@ -0,0 +1,2 @@
+# For Pogo usb management
+allow hal_usb_impl sysfs_pogo_usb:file rw_file_perms;

sepolicy/vendor/hal_wifi_ext.te

@@ -0,0 +1 @@
+allow hal_wifi_ext vendor_wlan_device:chr_file w_file_perms;

sepolicy/vendor/system_server.te

@@ -0,0 +1 @@
+allow system_server sysfs_touch_gti:file r_file_perms;

sepolicy/vendor/vendor_init.te

@@ -0,0 +1 @@
+get_prop(vendor_init, gesture_prop)

setup-makefiles.py

@@ -0,0 +1,13 @@
+#!/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

tangorpro/Android.bp

@@ -0,0 +1,11 @@
+//
+// 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,32 @@
 #
 TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := tangorpro
-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
+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))
 
 # 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
-
-ifdef PHONE_CAR_BOARD_PRODUCT
-    include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk 
-else
-    TARGET_SCREEN_DENSITY := 320
-endif
-
+TARGET_SCREEN_DENSITY := 320
 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/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

tangorpro/BoardConfigEvolution.mk

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

tangorpro/BoardConfigLineage.mk

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

tangorpro/device-evolution.mk

@@ -0,0 +1,8 @@
+#
+# 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

@@ -0,0 +1,13 @@
+#
+# 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

@@ -0,0 +1,94 @@
+#!/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

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

tangorpro/osaifu-keitai.patch

@@ -0,0 +1,24 @@
+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-evolution/packages/apps/Settings/res/values/evolution_strings.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2024 The Evolution X Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Android version screen, build maintainer -->
+    <string name="build_maintainer_summary" translatable="false">Anierin Bliss</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://PayPal.me/AnierinB</string>
+</resources>

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

@@ -353,10 +353,6 @@
     <!-- Duration, in milliseconds, of the display white balance animated transitions. -->
     <integer name="config_displayWhiteBalanceTransitionTime">30000</integer>
 
-    <!-- Enable doze mode
-         ComponentName of a dream to show whenever the system would otherwise have gone to sleep. -->
-    <string translatable="false" name="config_dozeComponent"></string>
-
     <!-- Whether the always on display mode is available. -->
     <bool name="config_dozeAlwaysOnDisplayAvailable">false</bool>
 

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>
 
-    <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">28px</dimen>
+    <!-- Default paddings for content around the corners. -->
+    <dimen name="rounded_corner_content_padding">12dp</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,6 +16,12 @@
 */
 -->
 <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/overlay_packages/GrilRadioCustomizableNoRadio/Android.bp

@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "GrilRadioCustomizableNoRadio",
+    product_specific: true,
+}

tangorpro/overlay_packages/GrilRadioCustomizableNoRadio/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.grilservice.radio.overlay">
+    <application android:extractNativeLibs="true" android:hasCode="false" />
+    <overlay android:targetPackage="com.google.android.grilservice"
+             android:priority="0"
+             android:isStatic="true" />
+</manifest>

tangorpro/overlay_packages/GrilRadioCustomizableNoRadio/res/values/config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="board_with_radio">false</bool>
+</resources>

tangorpro/overlay_packages/SettingsGoogleTangorproOverlay/Android.bp

@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "SettingsGoogleTangorproOverlay",
+    product_specific: true,
+}

tangorpro/overlay_packages/SettingsGoogleTangorproOverlay/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.tangorpro">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="10"
+        android:targetPackage="com.android.settings" />
+</manifest>

tangorpro/overlay_packages/SettingsGoogleTangorproOverlay/res/drawable-night/ic_enhanced_connectivity.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="300.0dip" android:width="412.0dip" android:autoMirrored="true" android:viewportWidth="412.0" android:viewportHeight="300.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h412v300h-412z" />
+        <path android:fillColor="#ff000000" android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5V28.5C0,12.8 12.5,0 27.8,0H384.3C399.5,0 412,12.8 412,28.5V271.7C412,287.2 399.5,300 384.2,300Z" />
+        <path android:fillColor="#ffd2e3fc" android:pathData="M206,287.5C281.94,287.5 343.5,225.94 343.5,150C343.5,74.06 281.94,12.5 206,12.5C130.06,12.5 68.5,74.06 68.5,150C68.5,225.94 130.06,287.5 206,287.5Z" android:strokeAlpha="0.2" android:fillAlpha="0.2" />
+        <path android:fillColor="#ffd2e3fc" android:pathData="M206,267.88C271.11,267.88 323.88,215.11 323.88,150C323.88,84.89 271.11,32.12 206,32.12C140.89,32.12 88.12,84.89 88.12,150C88.12,215.11 140.89,267.88 206,267.88Z" android:strokeAlpha="0.2" android:fillAlpha="0.2" />
+        <path android:fillColor="#ffd2e3fc" android:pathData="M206,248.4C260.34,248.4 304.39,204.34 304.39,150C304.39,95.66 260.34,51.61 206,51.61C151.66,51.61 107.6,95.66 107.6,150C107.6,204.34 151.66,248.4 206,248.4Z" android:strokeAlpha="0.2" android:fillAlpha="0.2" />
+        <path android:fillColor="#ff7f868c" android:pathData="M250.88,72.26C250.88,71.19 251.74,70.32 252.81,70.32L269.86,70.32C270.93,70.32 271.8,71.19 271.8,72.26L261.72,73.04L250.88,72.26Z" />
+        <path android:fillColor="#ff7f868c" android:pathData="M288.32,72.26C288.32,71.19 289.19,70.32 290.26,70.32L297.23,70.32C298.3,70.32 299.17,71.19 299.17,72.26L294.52,73.04L288.32,72.26Z" />
+        <path android:fillColor="#ff000000" android:pathData="M329.67,87.68L329.67,213.68A14.5,14.5 0,0 1,315.17 228.18L97.17,228.18A14.5,14.5 0,0 1,82.67 213.68L82.67,87.68A14.5,14.5 0,0 1,97.17 73.18L315.17,73.18A14.5,14.5 0,0 1,329.67 87.68z" android:strokeColor="#ff80868b" android:strokeWidth="3.0" />
+        <path android:fillColor="#fffeefc3" android:pathData="M206.59,214.97C215.02,214.97 221.86,208.15 221.86,199.73C221.86,191.31 215.02,184.49 206.59,184.49C198.16,184.49 191.32,191.31 191.32,199.73C191.32,208.15 198.16,214.97 206.59,214.97Z" />
+        <path android:fillColor="#fffcc934" android:pathData="M206.59,192.78L200.87,197.07V205.66H204.44V200.65H208.74V205.66H212.31V197.07L206.59,192.78Z" />
+        <path android:fillColor="#fffad2cf" android:pathData="M168.97,142.5C177.39,142.5 184.21,135.68 184.21,127.26C184.21,118.84 177.39,112.02 168.97,112.02C160.55,112.02 153.73,118.84 153.73,127.26C153.73,135.68 160.55,142.5 168.97,142.5Z" />
+        <path android:fillColor="#ffee675c" android:pathData="M172.6,133.54V122.43C172.6,122.19 172.5,121.95 172.33,121.78C172.16,121.61 171.92,121.51 171.68,121.51H170.46V120.02H167.56V121.44H166.36C166.12,121.44 165.88,121.54 165.71,121.71C165.53,121.88 165.43,122.12 165.43,122.36V133.43C165.43,133.68 165.53,133.91 165.71,134.08C165.88,134.25 166.12,134.35 166.36,134.35H171.67C171.9,134.35 172.12,134.27 172.29,134.12C172.46,133.98 172.57,133.77 172.6,133.54V133.54ZM171.15,122.92V128.15H166.81V122.95L171.15,122.92Z" />
+        <path android:fillColor="#fffad2cf" android:pathData="M243.03,187.34C251.46,187.34 258.3,180.5 258.3,172.07C258.3,163.64 251.46,156.8 243.03,156.8C234.6,156.8 227.76,163.64 227.76,172.07C227.76,180.5 234.6,187.34 243.03,187.34Z" />
+        <path android:fillColor="#ffee675c" android:pathData="M248.3,166.46C248.23,166.25 248.09,166.07 247.91,165.94C247.73,165.81 247.52,165.74 247.3,165.73H239.3C239.08,165.74 238.87,165.81 238.69,165.94C238.51,166.07 238.37,166.25 238.3,166.46L236.8,170.8V176.6C236.8,176.7 236.81,176.79 236.85,176.88C236.88,176.97 236.93,177.05 237,177.12C237.07,177.18 237.15,177.24 237.23,177.27C237.32,177.31 237.41,177.33 237.51,177.33H238.3C238.49,177.33 238.67,177.26 238.81,177.12C238.94,176.99 239.02,176.8 239.02,176.61V176.61V175.89H247.7V176.61C247.7,176.8 247.78,176.99 247.91,177.13C248.05,177.26 248.24,177.34 248.43,177.34H249.15C249.34,177.34 249.53,177.26 249.66,177.13C249.8,176.99 249.88,176.8 249.88,176.61V170.82L248.3,166.46ZM240,173.69C239.78,173.69 239.57,173.63 239.39,173.51C239.21,173.39 239.07,173.22 238.99,173.02C238.91,172.82 238.89,172.6 238.93,172.39C238.97,172.18 239.08,171.98 239.23,171.83C239.38,171.68 239.57,171.57 239.79,171.53C240,171.49 240.22,171.51 240.42,171.59C240.62,171.68 240.79,171.82 240.9,171.99C241.02,172.17 241.09,172.38 241.09,172.6V172.6C241.1,172.88 241,173.15 240.82,173.36C240.63,173.57 240.37,173.7 240.09,173.72V173.72L240,173.69ZM246.52,173.69C246.3,173.69 246.09,173.63 245.91,173.51C245.73,173.39 245.59,173.23 245.51,173.03C245.42,172.83 245.4,172.61 245.44,172.4C245.48,172.19 245.58,171.99 245.73,171.84C245.88,171.68 246.08,171.58 246.29,171.53C246.5,171.49 246.72,171.51 246.92,171.59C247.12,171.67 247.29,171.81 247.41,171.99C247.53,172.16 247.6,172.38 247.6,172.59C247.61,172.87 247.51,173.14 247.32,173.35C247.14,173.56 246.88,173.69 246.6,173.71L246.52,173.69ZM238.75,169.43L239.53,167.18H247L247.78,169.43H238.75Z" />
+        <path android:fillColor="#ffd2e3fc" android:pathData="M168.97,187.34C177.4,187.34 184.24,180.5 184.24,172.07C184.24,163.64 177.4,156.8 168.97,156.8C160.54,156.8 153.7,163.64 153.7,172.07C153.7,180.5 160.54,187.34 168.97,187.34Z" />
+        <path android:fillColor="#ff669df6" android:pathData="M175.8,169.38C175.65,168.51 175.2,167.72 174.53,167.15C173.85,166.59 172.99,166.29 172.11,166.3H166.48C165.6,166.3 164.75,166.6 164.07,167.17C163.4,167.73 162.94,168.51 162.79,169.38C162.79,169.38 161.62,176.14 161.62,176.24C161.62,176.55 161.72,176.86 161.89,177.12C162.07,177.38 162.31,177.59 162.6,177.71C162.89,177.83 163.21,177.86 163.52,177.81C163.83,177.75 164.11,177.61 164.34,177.39L167,174.76H171.61L174.27,177.39C174.5,177.61 174.78,177.76 175.09,177.82C175.4,177.87 175.72,177.84 176.01,177.72C176.3,177.6 176.55,177.39 176.73,177.13C176.9,176.86 177,176.56 177,176.24C177,176.15 175.8,169.38 175.8,169.38ZM168.51,170.92H167V172.45H166.23V170.92H164.7V170.15H166.23V168.61H167V170.15H168.54L168.51,170.92ZM170.67,171.15C170.55,171.15 170.43,171.12 170.32,171.05C170.22,170.99 170.14,170.89 170.09,170.78C170.04,170.66 170.03,170.54 170.05,170.42C170.07,170.3 170.13,170.19 170.21,170.1C170.3,170.01 170.41,169.95 170.53,169.92C170.65,169.9 170.77,169.91 170.89,169.95C171,170 171.1,170.08 171.17,170.18C171.24,170.28 171.28,170.4 171.28,170.52V170.52C171.28,170.68 171.21,170.84 171.1,170.96C170.99,171.07 170.83,171.14 170.67,171.14V171.15ZM171.97,172.45C171.89,172.45 171.81,172.44 171.73,172.41C171.66,172.38 171.59,172.34 171.53,172.28C171.47,172.23 171.42,172.16 171.39,172.09C171.36,172.01 171.34,171.93 171.34,171.85C171.34,171.69 171.4,171.53 171.52,171.41C171.64,171.3 171.79,171.23 171.96,171.23C172.12,171.23 172.28,171.3 172.4,171.41C172.51,171.53 172.58,171.69 172.58,171.85C172.58,172.01 172.51,172.17 172.4,172.28C172.29,172.4 172.13,172.46 171.97,172.46V172.45ZM171.97,169.84C171.85,169.84 171.73,169.81 171.62,169.74C171.52,169.68 171.44,169.58 171.39,169.47C171.34,169.35 171.33,169.23 171.35,169.11C171.37,168.99 171.43,168.88 171.51,168.79C171.6,168.7 171.71,168.64 171.83,168.61C171.95,168.59 172.07,168.6 172.19,168.64C172.3,168.69 172.4,168.77 172.47,168.87C172.54,168.97 172.58,169.09 172.58,169.21V169.21C172.58,169.37 172.51,169.53 172.4,169.65C172.29,169.76 172.13,169.83 171.97,169.83V169.84ZM173.28,171.15C173.16,171.15 173.04,171.11 172.93,171.05C172.83,170.98 172.75,170.88 172.71,170.77C172.66,170.65 172.65,170.53 172.67,170.41C172.7,170.29 172.75,170.18 172.84,170.09C172.93,170.01 173.04,169.95 173.16,169.92C173.28,169.9 173.4,169.91 173.52,169.96C173.63,170 173.73,170.08 173.79,170.19C173.86,170.29 173.9,170.41 173.9,170.53C173.9,170.7 173.83,170.85 173.72,170.97C173.6,171.09 173.44,171.15 173.28,171.15Z" />
+        <path android:fillColor="#ffd2e3fc" android:pathData="M243.24,142.48C251.66,142.48 258.48,135.66 258.48,127.24C258.48,118.82 251.66,112 243.24,112C234.82,112 228,118.82 228,127.24C228,135.66 234.82,142.48 243.24,142.48Z" />
+        <path android:fillColor="#ffceead6" android:pathData="M206.59,114.81C214.99,114.81 221.8,108 221.8,99.6C221.8,91.2 214.99,84.39 206.59,84.39C198.19,84.39 191.38,91.2 191.38,99.6C191.38,108 198.19,114.81 206.59,114.81Z" />
+        <path android:fillColor="#ff5bb974" android:pathData="M211.66,94.53H209.76L211,97.07H209.1L207.81,94.53H206.54L207.81,97.07H206L204.74,94.53H203.42L204.69,97.07H202.79L201.52,94.53C201.19,94.53 200.87,94.66 200.63,94.9C200.39,95.14 200.26,95.46 200.26,95.79V103.4C200.26,103.57 200.29,103.73 200.35,103.88C200.42,104.04 200.51,104.18 200.63,104.29C200.74,104.41 200.88,104.5 201.04,104.57C201.19,104.63 201.35,104.66 201.52,104.66H211.66C211.83,104.66 211.99,104.63 212.15,104.57C212.3,104.5 212.44,104.41 212.56,104.29C212.68,104.18 212.77,104.04 212.83,103.89C212.9,103.73 212.93,103.57 212.93,103.4V95.8C212.93,95.63 212.9,95.47 212.83,95.31C212.77,95.16 212.68,95.02 212.56,94.9C212.44,94.78 212.3,94.69 212.15,94.63C211.99,94.56 211.83,94.53 211.66,94.53ZM211.66,103.41H201.52V98.34H211.66V103.41Z" />
+        <path android:fillColor="#ff669df6" android:pathData="M243.5,132.11C243.18,132.11 242.89,131.99 242.65,131.75C242.4,131.5 242.28,131.22 242.28,130.9C242.28,130.57 242.4,130.29 242.65,130.04C242.89,129.8 243.18,129.68 243.5,129.68C243.82,129.68 244.11,129.8 244.35,130.04C244.6,130.29 244.72,130.57 244.72,130.9C244.72,131.22 244.6,131.5 244.35,131.75C244.11,131.99 243.82,132.11 243.5,132.11ZM240.14,129L239.29,128.15C239.92,127.51 240.58,127.04 241.27,126.72C241.96,126.41 242.71,126.25 243.5,126.25C244.29,126.25 245.04,126.41 245.73,126.72C246.42,127.04 247.08,127.51 247.71,128.15L246.86,129C246.31,128.45 245.75,128.06 245.19,127.82C244.63,127.59 244.07,127.47 243.5,127.47C242.93,127.47 242.37,127.59 241.81,127.82C241.25,128.06 240.69,128.45 240.14,129ZM237.85,126.71L237,125.86C237.84,125 238.82,124.31 239.93,123.79C241.05,123.26 242.24,123 243.5,123C244.76,123 245.95,123.26 247.07,123.79C248.18,124.31 249.16,125 250,125.86L249.15,126.71C248.35,125.95 247.48,125.35 246.54,124.9C245.6,124.44 244.58,124.22 243.5,124.22C242.42,124.22 241.4,124.44 240.46,124.9C239.52,125.35 238.65,125.95 237.85,126.71Z" />
+    </group>
+</vector>

tangorpro/overlay_packages/SettingsGoogleTangorproOverlay/res/drawable-night/quickly_open_camera.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="300.0dip" android:width="412.0dip" android:viewportWidth="412.0" android:viewportHeight="300.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff000000" android:pathData="M28,0L384,0A28,28 0,0 1,412 28L412,272A28,28 0,0 1,384 300L28,300A28,28 0,0 1,0 272L0,28A28,28 0,0 1,28 0z" />
+    <path android:fillColor="#ffd2e3fc" android:pathData="M281.58,77L285.99,77C285.99,72.82 289.4,69.41 293.58,69.41C297.76,69.41 301.16,72.82 301.16,77L305.58,77C305.58,70.34 300.16,65 293.58,65C287,65 281.58,70.42 281.58,77Z" />
+    <path android:fillColor="#ff669df6" android:pathData="M293.58,69.41C289.39,69.41 285.99,72.82 285.99,77L301.24,77C301.24,72.82 297.83,69.41 293.58,69.41Z" />
+    <path android:fillColor="#ff80868b" android:pathData="M250.71,77.58C250.71,76.51 251.57,75.64 252.64,75.64L269.69,75.64C270.76,75.64 271.63,76.51 271.63,77.58L261.55,78.36L250.71,77.58Z" />
+    <path android:fillColor="#ff80868b" android:pathData="M288.15,77.58C288.15,76.51 289.02,75.64 290.09,75.64L297.06,75.64C298.13,75.64 299,76.51 299,77.58L294.35,78.36L288.15,77.58Z" />
+    <path android:fillColor="#ffe8eaed" android:pathData="M329.5,93L329.5,219A14.5,14.5 0,0 1,315 233.5L97,233.5A14.5,14.5 0,0 1,82.5 219L82.5,93A14.5,14.5 0,0 1,97 78.5L315,78.5A14.5,14.5 0,0 1,329.5 93z" android:strokeColor="#ff80868b" android:strokeWidth="3.0" />
+    <path android:fillColor="#ff000000" android:pathData="M205.96,154.11C208.39,154.11 210.36,152.14 210.36,149.7C210.36,147.27 208.39,145.3 205.96,145.3C203.52,145.3 201.55,147.27 201.55,149.7C201.55,152.14 203.52,154.11 205.96,154.11Z" />
+    <path android:fillColor="#ff000000" android:pathData="M220.09,135.57H214.52L211.28,132H200.64L197.4,135.57H191.83C189.92,135.57 188.25,137.15 188.25,139.15V160.43C188.25,162.34 189.83,164 191.83,164H220.17C222.08,164 223.74,162.42 223.74,160.43V139.15C223.66,137.15 222,135.57 220.09,135.57ZM205.96,157.68C201.55,157.68 197.98,154.11 197.98,149.7C197.98,145.3 201.55,141.73 205.96,141.73C210.36,141.73 213.94,145.3 213.94,149.7C213.94,154.11 210.36,157.68 205.96,157.68Z" />
+</vector>

tangorpro/overlay_packages/SettingsGoogleTangorproOverlay/res/drawable/ic_enhanced_connectivity.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="300.0dip" android:width="412.0dip" android:autoMirrored="true" android:viewportWidth="412.0" android:viewportHeight="300.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h412v300h-412z" />
+        <path android:fillColor="#ffffffff" android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5V28.5C0,12.8 12.5,0 27.8,0H384.3C399.5,0 412,12.8 412,28.5V271.7C412,287.2 399.5,300 384.2,300Z" />
+        <path android:fillColor="#ffe0ebfd" android:pathData="M206,287.5C281.94,287.5 343.5,225.94 343.5,150C343.5,74.06 281.94,12.5 206,12.5C130.06,12.5 68.5,74.06 68.5,150C68.5,225.94 130.06,287.5 206,287.5Z" android:strokeAlpha="0.2" android:fillAlpha="0.2" />
+        <path android:fillColor="#ffc8dbfc" android:pathData="M206,267.88C271.11,267.88 323.88,215.11 323.88,150C323.88,84.89 271.11,32.12 206,32.12C140.89,32.12 88.12,84.89 88.12,150C88.12,215.11 140.89,267.88 206,267.88Z" android:strokeAlpha="0.2" android:fillAlpha="0.2" />
+        <path android:fillColor="#ffb4cffb" android:pathData="M206,248.4C260.34,248.4 304.39,204.34 304.39,150C304.39,95.66 260.34,51.61 206,51.61C151.66,51.61 107.6,95.66 107.6,150C107.6,204.34 151.66,248.4 206,248.4Z" android:strokeAlpha="0.2" android:fillAlpha="0.2" />
+        <path android:fillColor="#ffdadce0" android:pathData="M250.88,72.26C250.88,71.19 251.74,70.32 252.81,70.32L269.86,70.32C270.93,70.32 271.8,71.19 271.8,72.26L261.72,73.04L250.88,72.26Z" />
+        <path android:fillColor="#ffdadce0" android:pathData="M288.32,72.26C288.32,71.19 289.19,70.32 290.26,70.32L297.23,70.32C298.3,70.32 299.17,71.19 299.17,72.26L294.52,73.04L288.32,72.26Z" />
+        <path android:fillColor="#ffffffff" android:pathData="M329.67,87.68L329.67,213.68A14.5,14.5 0,0 1,315.17 228.18L97.17,228.18A14.5,14.5 0,0 1,82.67 213.68L82.67,87.68A14.5,14.5 0,0 1,97.17 73.18L315.17,73.18A14.5,14.5 0,0 1,329.67 87.68z" android:strokeColor="#ffdadce0" android:strokeWidth="3.0" />
+        <path android:fillColor="#fffeefc3" android:pathData="M206.59,214.97C215.02,214.97 221.86,208.15 221.86,199.73C221.86,191.31 215.02,184.49 206.59,184.49C198.16,184.49 191.32,191.31 191.32,199.73C191.32,208.15 198.16,214.97 206.59,214.97Z" />
+        <path android:fillColor="#fff9ab00" android:pathData="M206.59,192.78L200.87,197.07V205.66H204.44V200.65H208.74V205.66H212.31V197.07L206.59,192.78Z" />
+        <path android:fillColor="#fffad2cf" android:pathData="M168.97,142.5C177.39,142.5 184.21,135.68 184.21,127.26C184.21,118.84 177.39,112.02 168.97,112.02C160.55,112.02 153.73,118.84 153.73,127.26C153.73,135.68 160.55,142.5 168.97,142.5Z" />
+        <path android:fillColor="#ffd93025" android:pathData="M172.6,133.54V122.43C172.6,122.19 172.5,121.95 172.33,121.78C172.16,121.61 171.92,121.51 171.68,121.51H170.46V120.02H167.56V121.44H166.36C166.12,121.44 165.88,121.54 165.71,121.71C165.53,121.88 165.43,122.12 165.43,122.36V133.43C165.43,133.68 165.53,133.91 165.71,134.08C165.88,134.25 166.12,134.35 166.36,134.35H171.67C171.9,134.35 172.12,134.27 172.29,134.12C172.46,133.98 172.57,133.77 172.6,133.54V133.54ZM171.15,122.92V128.15H166.81V122.95L171.15,122.92Z" />
+        <path android:fillColor="#fffad2cf" android:pathData="M243.03,187.34C251.46,187.34 258.3,180.5 258.3,172.07C258.3,163.64 251.46,156.8 243.03,156.8C234.6,156.8 227.76,163.64 227.76,172.07C227.76,180.5 234.6,187.34 243.03,187.34Z" />
+        <path android:fillColor="#ffd93025" android:pathData="M248.3,166.46C248.23,166.25 248.09,166.07 247.91,165.94C247.73,165.81 247.52,165.74 247.3,165.73H239.3C239.08,165.74 238.87,165.81 238.69,165.94C238.51,166.07 238.37,166.25 238.3,166.46L236.8,170.8V176.6C236.8,176.7 236.81,176.79 236.85,176.88C236.88,176.97 236.93,177.05 237,177.12C237.07,177.18 237.15,177.24 237.23,177.27C237.32,177.31 237.41,177.33 237.51,177.33H238.3C238.49,177.33 238.67,177.26 238.81,177.12C238.94,176.99 239.02,176.8 239.02,176.61V176.61V175.89H247.7V176.61C247.7,176.8 247.78,176.99 247.91,177.13C248.05,177.26 248.24,177.34 248.43,177.34H249.15C249.34,177.34 249.53,177.26 249.66,177.13C249.8,176.99 249.88,176.8 249.88,176.61V170.82L248.3,166.46ZM240,173.69C239.78,173.69 239.57,173.63 239.39,173.51C239.21,173.39 239.07,173.22 238.99,173.02C238.91,172.82 238.89,172.6 238.93,172.39C238.97,172.18 239.08,171.98 239.23,171.83C239.38,171.68 239.57,171.57 239.79,171.53C240,171.49 240.22,171.51 240.42,171.59C240.62,171.68 240.79,171.82 240.9,171.99C241.02,172.17 241.09,172.38 241.09,172.6V172.6C241.1,172.88 241,173.15 240.82,173.36C240.63,173.57 240.37,173.7 240.09,173.72V173.72L240,173.69ZM246.52,173.69C246.3,173.69 246.09,173.63 245.91,173.51C245.73,173.39 245.59,173.23 245.51,173.03C245.42,172.83 245.4,172.61 245.44,172.4C245.48,172.19 245.58,171.99 245.73,171.84C245.88,171.68 246.08,171.58 246.29,171.53C246.5,171.49 246.72,171.51 246.92,171.59C247.12,171.67 247.29,171.81 247.41,171.99C247.53,172.16 247.6,172.38 247.6,172.59C247.61,172.87 247.51,173.14 247.32,173.35C247.14,173.56 246.88,173.69 246.6,173.71L246.52,173.69ZM238.75,169.43L239.53,167.18H247L247.78,169.43H238.75Z" />
+        <path android:fillColor="#ffd2e3fc" android:pathData="M168.97,187.34C177.4,187.34 184.24,180.5 184.24,172.07C184.24,163.64 177.4,156.8 168.97,156.8C160.54,156.8 153.7,163.64 153.7,172.07C153.7,180.5 160.54,187.34 168.97,187.34Z" />
+        <path android:fillColor="#ff1a73e8" android:pathData="M175.8,169.38C175.65,168.51 175.2,167.72 174.53,167.15C173.85,166.59 172.99,166.29 172.11,166.3H166.48C165.6,166.3 164.75,166.6 164.07,167.17C163.4,167.73 162.94,168.51 162.79,169.38C162.79,169.38 161.62,176.14 161.62,176.24C161.62,176.55 161.72,176.86 161.89,177.12C162.07,177.38 162.31,177.59 162.6,177.71C162.89,177.83 163.21,177.86 163.52,177.81C163.83,177.75 164.11,177.61 164.34,177.39L167,174.76H171.61L174.27,177.39C174.5,177.61 174.78,177.76 175.09,177.82C175.4,177.87 175.72,177.84 176.01,177.72C176.3,177.6 176.55,177.39 176.73,177.13C176.9,176.86 177,176.56 177,176.24C177,176.15 175.8,169.38 175.8,169.38ZM168.51,170.92H167V172.45H166.23V170.92H164.7V170.15H166.23V168.61H167V170.15H168.54L168.51,170.92ZM170.67,171.15C170.55,171.15 170.43,171.12 170.32,171.05C170.22,170.99 170.14,170.89 170.09,170.78C170.04,170.66 170.03,170.54 170.05,170.42C170.07,170.3 170.13,170.19 170.21,170.1C170.3,170.01 170.41,169.95 170.53,169.92C170.65,169.9 170.77,169.91 170.89,169.95C171,170 171.1,170.08 171.17,170.18C171.24,170.28 171.28,170.4 171.28,170.52V170.52C171.28,170.68 171.21,170.84 171.1,170.96C170.99,171.07 170.83,171.14 170.67,171.14V171.15ZM171.97,172.45C171.89,172.45 171.81,172.44 171.73,172.41C171.66,172.38 171.59,172.34 171.53,172.28C171.47,172.23 171.42,172.16 171.39,172.09C171.36,172.01 171.34,171.93 171.34,171.85C171.34,171.69 171.4,171.53 171.52,171.41C171.64,171.3 171.79,171.23 171.96,171.23C172.12,171.23 172.28,171.3 172.4,171.41C172.51,171.53 172.58,171.69 172.58,171.85C172.58,172.01 172.51,172.17 172.4,172.28C172.29,172.4 172.13,172.46 171.97,172.46V172.45ZM171.97,169.84C171.85,169.84 171.73,169.81 171.62,169.74C171.52,169.68 171.44,169.58 171.39,169.47C171.34,169.35 171.33,169.23 171.35,169.11C171.37,168.99 171.43,168.88 171.51,168.79C171.6,168.7 171.71,168.64 171.83,168.61C171.95,168.59 172.07,168.6 172.19,168.64C172.3,168.69 172.4,168.77 172.47,168.87C172.54,168.97 172.58,169.09 172.58,169.21V169.21C172.58,169.37 172.51,169.53 172.4,169.65C172.29,169.76 172.13,169.83 171.97,169.83V169.84ZM173.28,171.15C173.16,171.15 173.04,171.11 172.93,171.05C172.83,170.98 172.75,170.88 172.71,170.77C172.66,170.65 172.65,170.53 172.67,170.41C172.7,170.29 172.75,170.18 172.84,170.09C172.93,170.01 173.04,169.95 173.16,169.92C173.28,169.9 173.4,169.91 173.52,169.96C173.63,170 173.73,170.08 173.79,170.19C173.86,170.29 173.9,170.41 173.9,170.53C173.9,170.7 173.83,170.85 173.72,170.97C173.6,171.09 173.44,171.15 173.28,171.15Z" />
+        <path android:fillColor="#ffd2e3fc" android:pathData="M243.24,142.48C251.66,142.48 258.48,135.66 258.48,127.24C258.48,118.82 251.66,112 243.24,112C234.82,112 228,118.82 228,127.24C228,135.66 234.82,142.48 243.24,142.48Z" />
+        <path android:fillColor="#ffceead6" android:pathData="M206.59,114.81C214.99,114.81 221.8,108 221.8,99.6C221.8,91.2 214.99,84.39 206.59,84.39C198.19,84.39 191.38,91.2 191.38,99.6C191.38,108 198.19,114.81 206.59,114.81Z" />
+        <path android:fillColor="#ff1e8e3e" android:pathData="M211.66,94.53H209.76L211,97.07H209.1L207.81,94.53H206.54L207.81,97.07H206L204.74,94.53H203.42L204.69,97.07H202.79L201.52,94.53C201.19,94.53 200.87,94.66 200.63,94.9C200.39,95.14 200.26,95.46 200.26,95.79V103.4C200.26,103.57 200.29,103.73 200.35,103.88C200.42,104.04 200.51,104.18 200.63,104.29C200.74,104.41 200.88,104.5 201.04,104.57C201.19,104.63 201.35,104.66 201.52,104.66H211.66C211.83,104.66 211.99,104.63 212.15,104.57C212.3,104.5 212.44,104.41 212.56,104.29C212.68,104.18 212.77,104.04 212.83,103.89C212.9,103.73 212.93,103.57 212.93,103.4V95.8C212.93,95.63 212.9,95.47 212.83,95.31C212.77,95.16 212.68,95.02 212.56,94.9C212.44,94.78 212.3,94.69 212.15,94.63C211.99,94.56 211.83,94.53 211.66,94.53ZM211.66,103.41H201.52V98.34H211.66V103.41Z" />
+        <path android:fillColor="#ff1a73e8" android:pathData="M243.5,132.11C243.18,132.11 242.89,131.99 242.65,131.75C242.4,131.5 242.28,131.22 242.28,130.9C242.28,130.57 242.4,130.29 242.65,130.04C242.89,129.8 243.18,129.68 243.5,129.68C243.82,129.68 244.11,129.8 244.35,130.04C244.6,130.29 244.72,130.57 244.72,130.9C244.72,131.22 244.6,131.5 244.35,131.75C244.11,131.99 243.82,132.11 243.5,132.11ZM240.14,129L239.29,128.15C239.92,127.51 240.58,127.04 241.27,126.72C241.96,126.41 242.71,126.25 243.5,126.25C244.29,126.25 245.04,126.41 245.73,126.72C246.42,127.04 247.08,127.51 247.71,128.15L246.86,129C246.31,128.45 245.75,128.06 245.19,127.82C244.63,127.59 244.07,127.47 243.5,127.47C242.93,127.47 242.37,127.59 241.81,127.82C241.25,128.06 240.69,128.45 240.14,129ZM237.85,126.71L237,125.86C237.84,125 238.82,124.31 239.93,123.79C241.05,123.26 242.24,123 243.5,123C244.76,123 245.95,123.26 247.07,123.79C248.18,124.31 249.16,125 250,125.86L249.15,126.71C248.35,125.95 247.48,125.35 246.54,124.9C245.6,124.44 244.58,124.22 243.5,124.22C242.42,124.22 241.4,124.44 240.46,124.9C239.52,125.35 238.65,125.95 237.85,126.71Z" />
+    </group>
+</vector>