[go: nahoru, domu]

Media, Media2 Test: Fix failures when the alarm volume is min value

When the alarm volume is min value, the volume value could be 1. In that
case, tests would fail because the tests try to lower the volume to 0
while it's impossible.

This CL fixes the failure by setting the min volume from 0 to 1 for
STREAM_ALARM. Although the exact min volume can be varies per device
configuration (e.g. STREAM_ALARM's min volume is 0 on TV devices), but
it's sufficient for tests.

Note that AudioManager.getMinStreamVolume() cannot be used because
it's added in API 28.

Test: Set alarm stream volume to min and run following command
      $ ./media/version-compat-test/runtest.sh 4
      $ ./media2/version-compat-test/runtest.sh 1
Change-Id: Ib9afa767b97bfe885ab5249838fc515f604b399d
diff --git a/media/version-compat-tests/current/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java b/media/version-compat-tests/current/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java
index 0105d38..38ac323 100644
--- a/media/version-compat-tests/current/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java
+++ b/media/version-compat-tests/current/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java
@@ -847,7 +847,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }
@@ -883,7 +883,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }
diff --git a/media2/src/androidTest/java/androidx/media2/MediaControllerTest.java b/media2/src/androidTest/java/androidx/media2/MediaControllerTest.java
index cfd5b37..b4f8d12 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaControllerTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaControllerTest.java
@@ -917,7 +917,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }
@@ -957,7 +957,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }
diff --git a/media2/version-compat-tests/current/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerTest.java b/media2/version-compat-tests/current/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerTest.java
index 8a770a3..01bc977 100644
--- a/media2/version-compat-tests/current/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerTest.java
+++ b/media2/version-compat-tests/current/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerTest.java
@@ -139,7 +139,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }
@@ -181,7 +181,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }
diff --git a/media2/version-compat-tests/current/service/src/androidTest/java/androidx/media2/test/service/tests/MediaSessionCompatCallbackTestWithMediaController.java b/media2/version-compat-tests/current/service/src/androidTest/java/androidx/media2/test/service/tests/MediaSessionCompatCallbackTestWithMediaController.java
index 73772e8..758a680 100644
--- a/media2/version-compat-tests/current/service/src/androidTest/java/androidx/media2/test/service/tests/MediaSessionCompatCallbackTestWithMediaController.java
+++ b/media2/version-compat-tests/current/service/src/androidTest/java/androidx/media2/test/service/tests/MediaSessionCompatCallbackTestWithMediaController.java
@@ -359,7 +359,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }
@@ -394,7 +394,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }
diff --git a/media2/version-compat-tests/current/service/src/androidTest/java/androidx/media2/test/service/tests/MediaSessionLegacyCallbackTest.java b/media2/version-compat-tests/current/service/src/androidTest/java/androidx/media2/test/service/tests/MediaSessionLegacyCallbackTest.java
index ca8bb36..d7576b3 100644
--- a/media2/version-compat-tests/current/service/src/androidTest/java/androidx/media2/test/service/tests/MediaSessionLegacyCallbackTest.java
+++ b/media2/version-compat-tests/current/service/src/androidTest/java/androidx/media2/test/service/tests/MediaSessionLegacyCallbackTest.java
@@ -393,7 +393,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }
@@ -433,7 +433,7 @@
         // 'Do Not Disturb' or 'Volume limit'.
         final int stream = AudioManager.STREAM_ALARM;
         final int maxVolume = mAudioManager.getStreamMaxVolume(stream);
-        final int minVolume = 0;
+        final int minVolume = 1;
         if (maxVolume <= minVolume) {
             return;
         }