commit 8766f47e928b9c2744bd071b8c8d6bb92cbe974d
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 04 12:46:10 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 04 12:46:10 2018 +0000
tree a814e0f805aa237c85ad693efce1e0f1baee527d
parent 94499c9ea93ab2f2b301fd62e9d1a221b97ffa57
parent 86a434fb1e8b78198abe4d92c71ff28cb4254400

Merge "Skip test if notification policy is not supported" into pi-dev

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 954c331..fcf4d38 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -270,6 +270,9 @@
     }
 
     public void testCheckingZenModeBlockDoesNotRequireNotificationPolicyAccess() throws Exception {
+        if (!mSupportNotificationPolicyAccess) {
+            return;
+        }
         try {
             // set zen mode to priority only, so playSoundEffect will check notification policy
             Utils.toggleNotificationPolicyAccess(mContext.getPackageName(), getInstrumentation(),