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

Commit e07424cb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4484469 from cc0933aa to pi-release 

Change-Id: I4e643d46b403fc9ce49c7fcc31a7d6ed52f3cf39
parents d3afb53b cc0933aa

boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp

+22 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <android/hardware/boot/1.0/IBootControl.h>



#include <VtsHalHidlTargetTestBase.h>

#include <VtsHalHidlTargetTestEnvBase.h>



using ::android::hardware::boot::V1_0::IBootControl;

using ::android::hardware::boot::V1_0::CommandResult;
@@ -33,11 +34,24 @@ using ::android::sp; 
using std::string;

using std::vector;



// Test environment for Boot HIDL HAL.

class BootHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:

    // get the test environment singleton

    static BootHidlEnvironment* Instance() {

        static BootHidlEnvironment* instance = new BootHidlEnvironment;

        return instance;

    }



    virtual void registerTestServices() override { registerTestService<IBootControl>(); }

};



// The main test class for the Boot HIDL HAL.

class BootHidlTest : public ::testing::VtsHalHidlTargetTestBase {

 public:

  virtual void SetUp() override {

    boot = ::testing::VtsHalHidlTargetTestBase::getService<IBootControl>();

      boot = ::testing::VtsHalHidlTargetTestBase::getService<IBootControl>(

          BootHidlEnvironment::Instance()->getServiceName<IBootControl>());

      ASSERT_NE(boot, nullptr);

  }
@@ -171,7 +185,9 @@ TEST_F(BootHidlTest, GetSuffix) { 
}



int main(int argc, char **argv) {

    ::testing::AddGlobalTestEnvironment(BootHidlEnvironment::Instance());

    ::testing::InitGoogleTest(&argc, argv);

    BootHidlEnvironment::Instance()->init(&argc, argv);

    int status = RUN_ALL_TESTS();

    LOG(INFO) << "Test result = " << status;

    return status;

cas/1.0/default/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -12,12 +12,6 @@ cc_binary { 
      "TypeConvert.cpp",

    ],



    product_variables: {

        treble: {

            cflags: ["-DUSE_VNDBINDER"],

        },

    },



    compile_multilib: "32",

    init_rc: ["android.hardware.cas@1.0-service.rc"],

cas/1.0/default/service.cpp

+0 −2
Original line number Diff line number Diff line
@@ -31,11 +31,9 @@ using android::hardware::cas::V1_0::IMediaCasService; 
int main() {

    ALOGD("android.hardware.cas@1.0-service starting...");



#ifdef USE_VNDBINDER

    // The CAS HAL may communicate to other vendor components via

    // /dev/vndbinder

    android::ProcessState::initWithDriver("/dev/vndbinder");

#endif // USE_VNDBINDER



    configureRpcThreadpool(8, true /* callerWillJoin */);

compatibility_matrix.current.xml

+0 −8
Original line number Diff line number Diff line
@@ -239,14 +239,6 @@ 
            <instance>slot1</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.radio.deprecated</name>

        <version>1.0</version>

        <interface>

            <name>IOemHook</name>

            <instance>slot1</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.renderscript</name>

        <version>1.0</version>

memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp

+22 −6
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <android/hardware/memtrack/1.0/IMemtrack.h>



#include <VtsHalHidlTargetTestBase.h>

#include <VtsHalHidlTargetTestEnvBase.h>



#include <fcntl.h>

#include <algorithm>
@@ -38,10 +39,23 @@ using ::android::base::unique_fd; 
using std::vector;

using std::count_if;



// Test environment for Memtrack HIDL HAL.

class MemtrackHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:

    // get the test environment singleton

    static MemtrackHidlEnvironment* Instance() {

        static MemtrackHidlEnvironment* instance = new MemtrackHidlEnvironment;

        return instance;

    }



    virtual void registerTestServices() override { registerTestService<IMemtrack>(); }

};



class MemtrackHidlTest : public ::testing::VtsHalHidlTargetTestBase {

 public:

  virtual void SetUp() override {

    memtrack = ::testing::VtsHalHidlTargetTestBase::getService<IMemtrack>();

      memtrack = ::testing::VtsHalHidlTargetTestBase::getService<IMemtrack>(

          MemtrackHidlEnvironment::Instance()->getServiceName<IMemtrack>());

      ASSERT_NE(memtrack, nullptr);

  }
@@ -159,7 +173,9 @@ TEST_F(MemtrackHidlTest, GetMemoryTest) { 
}



int main(int argc, char **argv) {

    ::testing::AddGlobalTestEnvironment(MemtrackHidlEnvironment::Instance());

    ::testing::InitGoogleTest(&argc, argv);

    MemtrackHidlEnvironment::Instance()->init(&argc, argv);

    int status = RUN_ALL_TESTS();

    LOG(INFO) << "Test result = " << status;

    return status;