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

Commit 1eb329e0 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to aml_res_330710000 for mainline module file: apex/manifest.json 

Change-Id: I6659bb5a09f5df21f007366fd18e32546503e648
parents 4c1118cb f6ce40da

apex/manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.resolv",

  "version": 330513000

  "version": 330710000

}

tests/dnsresolver_binder_test.cpp

+10 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <gtest/gtest.h>

#include <netdutils/Stopwatch.h>



#include <util.h>

#include "dns_metrics_listener/base_metrics_listener.h"

#include "dns_metrics_listener/test_metrics.h"

#include "unsolicited_listener/unsolicited_event_listener.h"
@@ -621,10 +622,16 @@ TEST_F(DnsResolverBinderTest, setLogSeverity) { 
    EXPECT_TRUE(mDnsResolver->setLogSeverity(IDnsResolver::DNS_RESOLVER_LOG_ERROR).isOk());

    mExpectedLogData.push_back({"setLogSeverity(4)", "setLogSeverity.*4"});



    // Set back to default

    // Set back to default based off resolv_init(), the default is INFO for userdebug builds

    // and is WARNING for the other builds.

    if (isUserDebugBuild()) {

        EXPECT_TRUE(mDnsResolver->setLogSeverity(IDnsResolver::DNS_RESOLVER_LOG_INFO).isOk());

        mExpectedLogData.push_back({"setLogSeverity(2)", "setLogSeverity.*2"});

    } else {

        EXPECT_TRUE(mDnsResolver->setLogSeverity(IDnsResolver::DNS_RESOLVER_LOG_WARNING).isOk());

        mExpectedLogData.push_back({"setLogSeverity(3)", "setLogSeverity.*3"});

    }

}



TEST_F(DnsResolverBinderTest, SetResolverOptions) {

    SKIP_IF_REMOTE_VERSION_LESS_THAN(mDnsResolver.get(), 9);