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

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

Snap for 4462748 from f9c17441 to pi-release 

Change-Id: I8e91c9cfbd0c7e6d7cd8f8e9182cb161c13fc086
parents 45dba46f f9c17441

usb/1.0/vts/functional/VtsHalUsbV1_0TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ class UsbHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
  // and the callback thread.

  std::mutex usb_mtx;

  std::condition_variable usb_cv;

  int usb_count;

  int usb_count = 0;

};



/*

wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp

+1 −3
Original line number Diff line number Diff line
@@ -206,7 +206,5 @@ bool configureChipToSupportIfaceType(const sp<IWifiChip>& wifi_chip, 
void stopWifi() {

    sp<IWifi> wifi = getWifi();

    ASSERT_NE(wifi, nullptr);

    const auto status = HIDL_INVOKE(wifi, stop);

    ASSERT_TRUE((status.code == WifiStatusCode::SUCCESS) ||

                (status.code == WifiStatusCode::ERROR_NOT_AVAILABLE));

    HIDL_INVOKE(wifi, stop);

}