Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 052b44e4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12710726 from 67b3ce68 to 25Q1-release

Change-Id: Ia33caa0550818e0d20bb02c04f0775910e5429a4
parents 28380356 67b3ce68
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ cc_test {
    defaults: ["VtsHalAudioEffectTargetTestDefaults"],
    static_libs: ["libaudioaidlranges"],
    srcs: ["VtsHalDynamicsProcessingTest.cpp"],
    shared_libs: [
        "libaudioutils",
    ],
}

cc_test {
+243 −73

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.health</name>
        <version>3</version>
        <version>3-4</version>
        <interface>
            <name>IHealth</name>
            <instance>default</instance>
+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ bool ShouldCheckMissingAidlHalsInFcm(const std::string& packageAndVersion) {
            "android.hardware.audio.core.sounddose@1",
            "android.hardware.audio.core.sounddose@2",
            "android.hardware.audio.core.sounddose@3",
            // This is only used by a trusty VM
            "android.hardware.security.see.authmgr@1",

            // Deprecated HALs.
            "android.hardware.audio.sounddose@3",
+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@
#include <android/binder_process.h>
#include <android/sharedmem.h>
#include <cutils/native_handle.h>
#include <cutils/properties.h>

#include "drm_hal_clearkey_module.h"
#include "drm_hal_common.h"
@@ -193,6 +194,13 @@ void DrmHalTest::SetUp() {
        GTEST_SKIP() << "No vendor module installed";
    }

    char bootloader_state[PROPERTY_VALUE_MAX] = {};
    if (property_get("ro.boot.vbmeta.device_state", bootloader_state, "") != 0) {
        if (!strcmp(bootloader_state, "unlocked")) {
            GTEST_SKIP() << "Skip test because bootloader is unlocked";
        }
    }

    if (drmInstance.find("IDrmFactory") != std::string::npos) {
        drmFactory = IDrmFactory::fromBinder(
                ::ndk::SpAIBinder(AServiceManager_waitForService(drmInstance.c_str())));
Loading