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

Commit f43447ca authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "servicemanager: Fix UpdatableViaApex tests" am: 60ff4361 am:... 

Merge "servicemanager: Fix UpdatableViaApex tests" am: 60ff4361 am: a406329e am: d16f3bbb am: fdabdd1d am: 05d8b621

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2579395



Change-Id: I496a6afe3361c2722a8440b80b59ba63c6d55408
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents acc05ff7 05d8b621

cmds/servicemanager/test_sm.cpp

+13 −8
Original line number Diff line number Diff line
@@ -27,11 +27,14 @@ 
#include "Access.h"

#include "ServiceManager.h"



using android::sp;

using android::Access;

using android::BBinder;

using android::IBinder;

using android::ServiceManager;

using android::sp;

using android::base::EndsWith;

using android::base::GetProperty;

using android::base::StartsWith;

using android::binder::Status;

using android::os::BnServiceCallback;

using android::os::IServiceManager;
@@ -77,9 +80,11 @@ static sp<ServiceManager> getPermissiveServiceManager() { 
    return sm;

}



static bool isCuttlefish() {

    return android::base::StartsWith(android::base::GetProperty("ro.product.vendor.device", ""),

                                     "vsoc_");

// Determines if test device is a cuttlefish phone device

static bool isCuttlefishPhone() {

    auto device = GetProperty("ro.product.vendor.device", "");

    auto product = GetProperty("ro.product.vendor.name", "");

    return StartsWith(device, "vsoc_") && EndsWith(product, "_phone");

}



TEST(AddService, HappyHappy) {
@@ -314,7 +319,7 @@ TEST(ListServices, CriticalServices) { 
}



TEST(Vintf, UpdatableViaApex) {

    if (!isCuttlefish()) GTEST_SKIP() << "Skipping non-Cuttlefish devices";

    if (!isCuttlefishPhone()) GTEST_SKIP() << "Skipping non-Cuttlefish-phone devices";



    auto sm = getPermissiveServiceManager();

    std::optional<std::string> updatableViaApex;
@@ -326,7 +331,7 @@ TEST(Vintf, UpdatableViaApex) { 
}



TEST(Vintf, UpdatableViaApex_InvalidNameReturnsNullOpt) {

    if (!isCuttlefish()) GTEST_SKIP() << "Skipping non-Cuttlefish devices";

    if (!isCuttlefishPhone()) GTEST_SKIP() << "Skipping non-Cuttlefish-phone devices";



    auto sm = getPermissiveServiceManager();

    std::optional<std::string> updatableViaApex;
@@ -337,7 +342,7 @@ TEST(Vintf, UpdatableViaApex_InvalidNameReturnsNullOpt) { 
}



TEST(Vintf, GetUpdatableNames) {

    if (!isCuttlefish()) GTEST_SKIP() << "Skipping non-Cuttlefish devices";

    if (!isCuttlefishPhone()) GTEST_SKIP() << "Skipping non-Cuttlefish-phone devices";



    auto sm = getPermissiveServiceManager();

    std::vector<std::string> names;
@@ -348,7 +353,7 @@ TEST(Vintf, GetUpdatableNames) { 
}



TEST(Vintf, GetUpdatableNames_InvalidApexNameReturnsEmpty) {

    if (!isCuttlefish()) GTEST_SKIP() << "Skipping non-Cuttlefish devices";

    if (!isCuttlefishPhone()) GTEST_SKIP() << "Skipping non-Cuttlefish-phone devices";



    auto sm = getPermissiveServiceManager();

    std::vector<std::string> names;