Merge "AudioManager: test API for dynamic audio policy" into qt-dev

am: 7e46f59a60

Change-Id: I6c2016f410487b30d5eba3f7a1ec3e9ce3dc30b8

api/test-current.txt

@@ -1100,6 +1100,7 @@ package android.media {
 
   public class AudioManager {
     method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public int dispatchAudioFocusChange(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);
+    method public boolean hasRegisteredDynamicPolicy();
     method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public int registerAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);
     method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public void setFocusRequestResult(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);
     method @RequiresPermission("android.permission.MODIFY_AUDIO_ROUTING") public void unregisterAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);

media/java/android/media/AudioManager.java

@@ -3431,6 +3431,20 @@ public class AudioManager {
         }
     }
 
+    /**
+     * @hide
+     * @return true if an AudioPolicy was previously registered
+     */
+    @TestApi
+    public boolean hasRegisteredDynamicPolicy() {
+        final IAudioService service = getService();
+        try {
+            return service.hasRegisteredDynamicPolicy();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
     //====================================================================
     // Notification of playback activity & playback configuration
     /**

media/java/android/media/IAudioService.aidl

@@ -211,6 +211,8 @@ interface IAudioService {
 
     void setVolumePolicy(in VolumePolicy policy);
 
+    boolean hasRegisteredDynamicPolicy();
+
     void registerRecordingCallback(in IRecordingConfigDispatcher rcdb);
 
     oneway void unregisterRecordingCallback(in IRecordingConfigDispatcher rcdb);

services/core/java/com/android/server/audio/AudioService.java

@@ -6671,6 +6671,13 @@ public class AudioService extends IAudioService.Stub
         return AudioManager.SUCCESS;
     }
 
+    /** see AudioManager.hasRegisteredDynamicPolicy */
+    public boolean hasRegisteredDynamicPolicy() {
+        synchronized (mAudioPolicies) {
+            return !mAudioPolicies.isEmpty();
+        }
+    }
+
     private final Object mExtVolumeControllerLock = new Object();
     private IAudioPolicyCallback mExtVolumeController;
     private void setExtVolumeController(IAudioPolicyCallback apc) {