commit 88cc160f970cedac5995d2c3c4b4699770f3d16c
author Julia Reynolds <juliacr@google.com> Thu Mar 24 10:05:02 2016 -0700
committer The Android Automerger <android-build@google.com> Mon Apr 04 15:50:46 2016 -0700
tree 1e1850b514aec28fab21757774ab40648b570629
parent 82392ca9c4248df61de41f4619583e34f6cfbbd1

Fix failures related to DND access changes.

Bug: 27814247
Bug: 27813426
Change-Id: If188689a8f102a4545a95f696ec787ab6dc4a6af

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 c78f82a..d7ec5f1 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -81,8 +81,15 @@
     }
 
     public void testSoundEffects() throws Exception {
-        // set relative setting
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
+        try {
+            Utils.toggleNotificationPolicyAccess(
+                    mContext.getPackageName(), getInstrumentation(), true);
+            // set relative setting
+            mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
+        } finally {
+            Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), false);
+        }
         Settings.System.putInt(mContext.getContentResolver(), SOUND_EFFECTS_ENABLED, 1);
 
         // should hear sound after loadSoundEffects() called.
@@ -343,6 +350,9 @@
     }
 
     public void testSetRingerModePolicyAccess() throws Exception {
+        if (mUseFixedVolume || mIsTelevision) {
+            return;
+        }
         try {
             // Apps without policy access cannot change silent -> normal or silent -> vibrate.
             Utils.toggleNotificationPolicyAccess(

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

diff --git a/tests/tests/media/src/android/media/cts/RingtoneTest.java b/tests/tests/media/src/android/media/cts/RingtoneTest.java
index 3527b1a..de21bdd 100644
--- a/tests/tests/media/src/android/media/cts/RingtoneTest.java
+++ b/tests/tests/media/src/android/media/cts/RingtoneTest.java
@@ -54,7 +54,14 @@
         mAudioManager.setStreamVolume(AudioManager.STREAM_RING, maxVolume / 2,
                 AudioManager.FLAG_ALLOW_RINGER_MODES);
         // make sure that we are not in silent mode
-        mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
+        try {
+            Utils.toggleNotificationPolicyAccess(
+                    mContext.getPackageName(), getInstrumentation(), true);
+            mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
+        } finally {
+            Utils.toggleNotificationPolicyAccess(
+                    mContext.getPackageName(), getInstrumentation(), false);
+        }
 
         mDefaultRingUri = RingtoneManager.getActualDefaultRingtoneUri(mContext,
                 RingtoneManager.TYPE_RINGTONE);
@@ -80,7 +87,14 @@
             mRingtone.setStreamType(mOriginalStreamType);
         }
         if (mAudioManager != null) {
-            mAudioManager.setRingerMode(mOriginalRingerMode);
+            try {
+                Utils.toggleNotificationPolicyAccess(
+                        mContext.getPackageName(), getInstrumentation(), true);
+                mAudioManager.setRingerMode(mOriginalRingerMode);
+            } finally {
+                Utils.toggleNotificationPolicyAccess(
+                        mContext.getPackageName(), getInstrumentation(), false);
+            }
             mAudioManager.setStreamVolume(AudioManager.STREAM_RING, mOriginalVolume,
                     AudioManager.FLAG_ALLOW_RINGER_MODES);
         }