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

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

Snap for 7464903 from 251c0a79 to sc-d1-release 

Change-Id: Icb13e100b84d25a0d0d616e0e2c356851c2a1064
parents 9aa27b8d 251c0a79

gnss/aidl/vts/gnss_hal_test_cases.cpp

+21 −6
Original line number Original line Diff line number Diff line
@@ -311,27 +311,42 @@ TEST_P(GnssHalTest, TestGnssPowerIndication) { 
    EXPECT_TRUE(gnssPowerIndicationCallback->gnss_power_stats_cbq_.retrieve(

    EXPECT_TRUE(gnssPowerIndicationCallback->gnss_power_stats_cbq_.retrieve(

            gnssPowerIndicationCallback->last_gnss_power_stats_, kTimeoutSec));

            gnssPowerIndicationCallback->last_gnss_power_stats_, kTimeoutSec));

    EXPECT_EQ(gnssPowerIndicationCallback->gnss_power_stats_cbq_.calledCount(), 2);

    EXPECT_EQ(gnssPowerIndicationCallback->gnss_power_stats_cbq_.calledCount(), 2);



    auto powerStats2 = gnssPowerIndicationCallback->last_gnss_power_stats_;

    auto powerStats2 = gnssPowerIndicationCallback->last_gnss_power_stats_;





    if ((gnssPowerIndicationCallback->last_capabilities_ &

         (int)GnssPowerIndicationCallback::CAPABILITY_TOTAL)) {

        // Elapsed realtime must increase

        // Elapsed realtime must increase

        EXPECT_GT(powerStats2.elapsedRealtime.timestampNs, powerStats1.elapsedRealtime.timestampNs);

        EXPECT_GT(powerStats2.elapsedRealtime.timestampNs, powerStats1.elapsedRealtime.timestampNs);





        // Total energy must increase

        // Total energy must increase

        EXPECT_GT(powerStats2.totalEnergyMilliJoule, powerStats1.totalEnergyMilliJoule);

        EXPECT_GT(powerStats2.totalEnergyMilliJoule, powerStats1.totalEnergyMilliJoule);

    }





    // At least oone of singleband and multiband acquisition energy must increase

    // At least oone of singleband and multiband acquisition energy must increase

    bool singlebandAcqEnergyIncreased = powerStats2.singlebandAcquisitionModeEnergyMilliJoule >

    bool singlebandAcqEnergyIncreased = powerStats2.singlebandAcquisitionModeEnergyMilliJoule >

                                        powerStats1.singlebandAcquisitionModeEnergyMilliJoule;

                                        powerStats1.singlebandAcquisitionModeEnergyMilliJoule;

    bool multibandAcqEnergyIncreased = powerStats2.multibandAcquisitionModeEnergyMilliJoule >

    bool multibandAcqEnergyIncreased = powerStats2.multibandAcquisitionModeEnergyMilliJoule >

                                       powerStats1.multibandAcquisitionModeEnergyMilliJoule;

                                       powerStats1.multibandAcquisitionModeEnergyMilliJoule;



    if ((gnssPowerIndicationCallback->last_capabilities_ &

         (int)GnssPowerIndicationCallback::CAPABILITY_SINGLEBAND_ACQUISITION) ||

        (gnssPowerIndicationCallback->last_capabilities_ &

         (int)GnssPowerIndicationCallback::CAPABILITY_MULTIBAND_ACQUISITION)) {

        EXPECT_TRUE(singlebandAcqEnergyIncreased || multibandAcqEnergyIncreased);

        EXPECT_TRUE(singlebandAcqEnergyIncreased || multibandAcqEnergyIncreased);

    }





    // At least one of singleband and multiband tracking energy must increase

    // At least one of singleband and multiband tracking energy must increase

    bool singlebandTrackingEnergyIncreased = powerStats2.singlebandTrackingModeEnergyMilliJoule >

    bool singlebandTrackingEnergyIncreased = powerStats2.singlebandTrackingModeEnergyMilliJoule >

                                             powerStats1.singlebandTrackingModeEnergyMilliJoule;

                                             powerStats1.singlebandTrackingModeEnergyMilliJoule;

    bool multibandTrackingEnergyIncreased = powerStats2.multibandTrackingModeEnergyMilliJoule >

    bool multibandTrackingEnergyIncreased = powerStats2.multibandTrackingModeEnergyMilliJoule >

                                            powerStats1.multibandTrackingModeEnergyMilliJoule;

                                            powerStats1.multibandTrackingModeEnergyMilliJoule;

    if ((gnssPowerIndicationCallback->last_capabilities_ &

         (int)GnssPowerIndicationCallback::CAPABILITY_SINGLEBAND_TRACKING) ||

        (gnssPowerIndicationCallback->last_capabilities_ &

         (int)GnssPowerIndicationCallback::CAPABILITY_MULTIBAND_TRACKING)) {

        EXPECT_TRUE(singlebandTrackingEnergyIncreased || multibandTrackingEnergyIncreased);

        EXPECT_TRUE(singlebandTrackingEnergyIncreased || multibandTrackingEnergyIncreased);

    }





    // Clean up

    // Clean up

    StopAndClearLocations();

    StopAndClearLocations();

input/classifier/1.0/vts/functional/Android.bp

+4 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,10 @@ package { 
cc_test {

cc_test {

    name: "VtsHalInputClassifierV1_0TargetTest",

    name: "VtsHalInputClassifierV1_0TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalInputClassifierV1_0TargetTest.cpp"],

    srcs: [

        ":inputconstants_aidl",

        "VtsHalInputClassifierV1_0TargetTest.cpp",

    ],

    header_libs: ["jni_headers"],

    header_libs: ["jni_headers"],

    static_libs: [

    static_libs: [

        "android.hardware.input.classifier@1.0",

        "android.hardware.input.classifier@1.0",

wifi/1.0/vts/OWNERS

+1 −1
Original line number Original line Diff line number Diff line 
kumaranand@google.com

arabawy@google.com

etancohen@google.com
 
etancohen@google.com

wifi/1.1/vts/OWNERS

+1 −1
Original line number Original line Diff line number Diff line 
kumaranand@google.com

arabawy@google.com

etancohen@google.com
 
etancohen@google.com

wifi/1.2/vts/OWNERS

+1 −1
Original line number Original line Diff line number Diff line 
kumaranand@google.com

arabawy@google.com

etancohen@google.com
 
etancohen@google.com