commit 89925ec62138d6b48c40a3886c8d179285ae1349
author Beverly <beverlyt@google.com> Tue Jun 26 13:54:34 2018 -0400
committer Beverly <beverlyt@google.com> Tue Jun 26 14:04:26 2018 -0400
tree 276f86d7b6c32bd8292caaee91b24ca81511994d
parent ce743c9c3509f6635c9f34dcc50bb2f97154e47b

Disable testVolumeDndAffectedStream

Test is no longer relevant

Test: builds
Change-Id: I927444f5e8e679526a4d4dd631d8fcef5047bc3f
Fixes: 73355088

tests/tests/media/src/android/media/cts/AudioManagerTest.java

diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index f0b6e7d..4c46420 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -582,46 +582,6 @@
         }
     }
 
-    public void testVolumeDndAffectedStream() throws Exception {
-        if (mHasVibrator || mSkipRingerTests || !mSupportNotificationPolicyAccess) {
-            return;
-        }
-        Utils.toggleNotificationPolicyAccess(
-                mContext.getPackageName(), getInstrumentation(), true);
-        mAudioManager.setStreamVolume(
-                AudioManager.STREAM_SYSTEM, 7, AudioManager.FLAG_ALLOW_RINGER_MODES);
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
-        Utils.toggleNotificationPolicyAccess(
-                mContext.getPackageName(), getInstrumentation(), false);
-        // 7 to 0, fail.
-        try {
-            mAudioManager.setStreamVolume(
-                    AudioManager.STREAM_SYSTEM, 0, AudioManager.FLAG_ALLOW_RINGER_MODES);
-            fail("Apps without notification policy access cannot change ringer mode");
-        } catch (SecurityException e) {}
-
-        // 7 to 1: success
-        mAudioManager.setStreamVolume(
-                AudioManager.STREAM_SYSTEM, 1, AudioManager.FLAG_ALLOW_RINGER_MODES);
-        assertEquals("setStreamVolume did not change volume",
-                1, mAudioManager.getStreamVolume(AudioManager.STREAM_SYSTEM));
-
-        // 0 to non-zero: fail.
-        Utils.toggleNotificationPolicyAccess(
-                mContext.getPackageName(), getInstrumentation(), true);
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT);
-        mAudioManager.setStreamVolume(
-                AudioManager.STREAM_SYSTEM, 0, AudioManager.FLAG_ALLOW_RINGER_MODES);
-        Utils.toggleNotificationPolicyAccess(
-                mContext.getPackageName(), getInstrumentation(), false);
-
-        try {
-            mAudioManager.setStreamVolume(
-                    AudioManager.STREAM_SYSTEM, 6, AudioManager.FLAG_ALLOW_RINGER_MODES);
-            fail("Apps without notification policy access cannot change ringer mode");
-        } catch (SecurityException e) {}
-    }
-
     public void testVolume() throws Exception {
         if (!mSupportNotificationPolicyAccess) {
             return;