Merge "Hide the audio switcher if it is not relevant" into pi-dev am: 3f5444b9e4

am: 67d44d9d61 Change-Id: I36b249159ef8d0a6d099ba776c5d682ea596e5e3
2018-04-24 21:04:45 -07:00
parent 811de70915 67d44d9d61
commit 8118c8d7d0
6 changed files with 31 additions and 30 deletions
--- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
@@ -245,7 +245,7 @@ public class AudioOutputSwitchPreferenceControllerTest {

        @Override
        public String getPreferenceKey() {
-            return null;
+            return TEST_KEY;
        }
    }
 }