From e7d6d97f0d95b9e8982b0d4d9f5e8ce688291940 Mon Sep 17 00:00:00 2001
From: Terry Heo <terryheo@google.com>
Date: Thu, 4 Sep 2014 21:05:28 +0900
Subject: [PATCH] Add a system API to query hdmi system audio mode

Bug: 17383620
Change-Id: I75f11619845e5070190414a2bbe967ba85001472
---
 media/java/android/media/AudioManager.java  | 16 ++++++++++++++++
 media/java/android/media/AudioService.java  |  5 +++++
 media/java/android/media/IAudioService.aidl |  4 +++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index e2770b400dfd2..a0a070a3bdba2 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -19,6 +19,7 @@ package android.media;
 import android.Manifest;
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
+import android.annotation.SystemApi;
 import android.app.PendingIntent;
 import android.bluetooth.BluetoothDevice;
 import android.content.ComponentName;
@@ -3001,6 +3002,21 @@ public class AudioManager {
         }
     }
 
+    /**
+     * Returns true if Hdmi Cec system audio mode is supported.
+     *
+     * @hide
+     */
+    @SystemApi
+    public boolean isHdmiSystemAudioSupported() {
+        try {
+            return getService().isHdmiSystemAudioSupported();
+        } catch (RemoteException e) {
+            Log.w(TAG, "Error querying system audio mode", e);
+            return false;
+        }
+    }
+
     /**
      * Return codes for listAudioPorts(), createAudioPatch() ...
      */
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index d00292429bf71..8d321cc1d8242 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -5083,6 +5083,11 @@ public class AudioService extends IAudioService.Stub {
         return device;
     }
 
+    @Override
+    public boolean isHdmiSystemAudioSupported() {
+        return mHdmiSystemAudioSupported;
+    }
+
     //==========================================================================================
     // Camera shutter sound policy.
     // config_camera_sound_forced configuration option in config.xml defines if the camera shutter
diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl
index 6477055fa3050..75fc03cd8689b 100644
--- a/media/java/android/media/IAudioService.aidl
+++ b/media/java/android/media/IAudioService.aidl
@@ -201,6 +201,8 @@ interface IAudioService {
 
     int setHdmiSystemAudioSupported(boolean on);
 
-           boolean registerAudioPolicy(in AudioPolicyConfig policyConfig, IBinder cb);
+    boolean isHdmiSystemAudioSupported();
+
+    boolean registerAudioPolicy(in AudioPolicyConfig policyConfig, IBinder cb);
     oneway void unregisterAudioPolicyAsync(in IBinder cb);
 }