commit b253cec66de2986379ef94e1d372123dee1b826f
author Dan Albert <danalbert@google.com> Thu Jan 21 20:28:04 2021 +0000
committer Dan Albert <danalbert@google.com> Thu Jan 21 20:28:04 2021 +0000
tree dc2ca1b340a361303617db5dbe88a07183c06370
parent a960d1d94d2ef121d6fab50eeb89bfdae6c2d16a

Revert "transcoding: add thermal status listener"

This reverts commit a960d1d94d2ef121d6fab50eeb89bfdae6c2d16a.

Reason for revert: broke build due to race condition with automerger

Change-Id: I1e64e54bf1c37a9cf8cddf9128469b0fbf931e8b

services/mediatranscoding/tests/Android.bp

diff --git a/services/mediatranscoding/tests/Android.bp b/services/mediatranscoding/tests/Android.bp
index 9d3e56c..5a7c4cc 100644
--- a/services/mediatranscoding/tests/Android.bp
+++ b/services/mediatranscoding/tests/Android.bp
@@ -18,13 +18,13 @@
         "libbinder_ndk",
         "liblog",
         "libutils",
+        "libmediatranscodingservice",
         "libcutils",
     ],
 
     static_libs: [
         "mediatranscoding_aidl_interface-ndk_platform",
         "resourcemanager_aidl_interface-ndk_platform",
-        "libmediatranscodingservice",
     ],
 
     required: [

services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp

diff --git a/services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp b/services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp
index 601bb1b..7dfda44 100644
--- a/services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp
+++ b/services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp
@@ -354,36 +354,5 @@
     ALOGD("TestTranscodingUidPolicy finished.");
 }
 
-TEST_F(MediaTranscodingServiceSimulatedTest, TestTranscodingThermalPolicy) {
-    ALOGD("TestTranscodingThermalPolicy starting...");
-
-    registerMultipleClients();
-
-    // Submit request, should start immediately.
-    EXPECT_TRUE(mClient1->submit(0, "test_source_file_0", "test_destination_file_0"));
-    EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
-
-    // Now, simulate thermal status change by adb cmd. The status code is as defined in
-    // frameworks/native/include/android/thermal.h.
-    // ATHERMAL_STATUS_SEVERE(3): should start throttling.
-    EXPECT_TRUE(ShellHelper::RunCmd("cmd thermalservice override-status 3"));
-    EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Pause(CLIENT(1), 0));
-
-    // ATHERMAL_STATUS_CRITICAL(4): shouldn't start throttling again (already started).
-    EXPECT_TRUE(ShellHelper::RunCmd("cmd thermalservice override-status 4"));
-    EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::NoEvent);
-
-    // ATHERMAL_STATUS_MODERATE(2): should stop throttling.
-    EXPECT_TRUE(ShellHelper::RunCmd("cmd thermalservice override-status 2"));
-    EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Resume(CLIENT(1), 0));
-
-    // ATHERMAL_STATUS_LIGHT(1): shouldn't stop throttling again (already stopped).
-    EXPECT_TRUE(ShellHelper::RunCmd("cmd thermalservice override-status 1"));
-    EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
-
-    unregisterMultipleClients();
-
-    ALOGD("TestTranscodingThermalPolicy finished.");
-}
 }  // namespace media
 }  // namespace android