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

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

Snap for 6211803 from 1812b564 to rvc-release 

Change-Id: If4c66c32c263e97700db3046486d651448368722
parents eeadb9f1 1812b564

DnsResolverService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ DnsResolverService::DnsResolverService() { 
binder_status_t DnsResolverService::start() {

    // TODO: Add disableBackgroundScheduling(true) after libbinder_ndk support it. b/126506010

    // NetdNativeService does call disableBackgroundScheduling currently, so it is fine now.

    DnsResolverService* resolverService = new DnsResolverService();

    std::shared_ptr<DnsResolverService> resolverService =

            ::ndk::SharedRefBase::make<DnsResolverService>();

    binder_status_t status =

            AServiceManager_addService(resolverService->asBinder().get(), getServiceName());

    if (status != STATUS_OK) {

DnsResolverService.h

+2 −1
Original line number Diff line number Diff line
@@ -61,8 +61,9 @@ class DnsResolverService : public aidl::android::net::BnDnsResolver { 
    // Debug log command

    ::ndk::ScopedAStatus setLogSeverity(int32_t logSeverity) override;



  private:

    DnsResolverService();



  private:

    // TODO: Remove below items after libbiner_ndk supports check_permission.

    ::ndk::ScopedAStatus checkAnyPermission(const std::vector<const char*>& permissions);

};

tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ cc_test { 
    name: "resolv_integration_test",

    test_suites: ["device-tests", "mts"],

    require_root: true,

    test_config: "resolv_integration_test_config.xml",

    defaults: ["netd_defaults"],

    tidy: false, // cuts test build time by > 1m30s

    srcs: [

tests/resolv_integration_test_config.xml

0 → 100644
+15 −0
Original line number Diff line number Diff line 
<configuration description="Configuration for resolv integration tests">

   <option name="test-suite-tag" value="mts" />

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

       <option name="cleanup" value="true" />

       <option name="push" value="resolv_integration_test->/data/local/tmp/resolv_integration_test" />

       <option name="append-bitness" value="true" />

   </target_preparer>

   <test class="com.android.tradefed.testtype.GTest" >

       <option name="native-test-device-path" value="/data/local/tmp" />

       <option name="module-name" value="resolv_integration_test" />

       <option name="runtime-hint" value="10m" />

       <!-- test-timeout unit is ms, value = 10 min -->

       <option name="native-test-timeout" value="600000" />

   </test>

</configuration>