From 0fd5bc2dcec7b951d070ae485a34d291ce35e647 Mon Sep 17 00:00:00 2001
From: Kevin Rocard <krocard@google.com>
Date: Thu, 25 Jan 2018 12:52:50 -0800
Subject: [PATCH] Audio V4: Remove deprecated function and enum

The debugDump function was deprecated by the introduction of the
debug method in the IBase.

AudioMode CURRENT and INVALID should not be passed to the
vendor.

Bug: 38184704
Test: none
Change-Id: I0e14c71ce7216524587a6ba28cae0cdb821bae23
Signed-off-by: Kevin Rocard <krocard@google.com>
---
 audio/4.0/IDevice.hal                | 12 ------------
 audio/4.0/IStream.hal                | 12 ------------
 audio/common/4.0/types.hal           |  2 --
 audio/effect/4.0/IEffectsFactory.hal | 12 ------------
 4 files changed, 38 deletions(-)

diff --git a/audio/4.0/IDevice.hal b/audio/4.0/IDevice.hal
index 2f121c1e81..4bc2d4db0c 100644
--- a/audio/4.0/IDevice.hal
+++ b/audio/4.0/IDevice.hal
@@ -254,16 +254,4 @@ interface IDevice {
      */
     setParameters(vec<ParameterValue> context, vec<ParameterValue> parameters)
             generates (Result retval);
-
-    /**
-     * Dumps information about the device into the provided file descriptor.
-     * This is used for the dumpsys facility.
-     * The implementation should not block as the caller might have time
-     * constraint on the dump.
-     * A back to back dump of all HAL Device and Stream should take under 100ms.
-     *
-     * @param fd dump file descriptor.
-     * @return retval operation completion status: OK or NOT_SUPPORTED.
-     */
-    debugDump(handle fd) generates (Result retval);
 };
diff --git a/audio/4.0/IStream.hal b/audio/4.0/IStream.hal
index 306152b372..34e7a140c8 100644
--- a/audio/4.0/IStream.hal
+++ b/audio/4.0/IStream.hal
@@ -258,18 +258,6 @@ interface IStream {
     setParameters(vec<ParameterValue> context, vec<ParameterValue> parameters)
             generates (Result retval);
 
-    /**
-     * Dumps information about the stream into the provided file descriptor.
-     * This is used for the dumpsys facility.
-     * The implementation should not block as the caller might have time
-     * constraint on the dump.
-     * A back to back dump of all HAL Device and Stream should take under 100ms.
-     *
-     * @param fd dump file descriptor.
-     * @return retval operation completion status: OK or NOT_SUPPORTED.
-     */
-    debugDump(handle fd) generates (Result retval);
-
     /**
      * Called by the framework to start a stream operating in mmap mode.
      * createMmapBuffer() must be called before calling start().
diff --git a/audio/common/4.0/types.hal b/audio/common/4.0/types.hal
index 5212dcd2d3..e9e7173665 100644
--- a/audio/common/4.0/types.hal
+++ b/audio/common/4.0/types.hal
@@ -493,8 +493,6 @@ enum AudioInterleave : int32_t {
  */
 @export(name="audio_mode_t", value_prefix="AUDIO_MODE_")
 enum AudioMode : int32_t {
-    INVALID          = -2,
-    CURRENT          = -1,
     NORMAL           = 0,
     RINGTONE         = 1,
     IN_CALL          = 2,
diff --git a/audio/effect/4.0/IEffectsFactory.hal b/audio/effect/4.0/IEffectsFactory.hal
index 84efb74ded..034af584af 100644
--- a/audio/effect/4.0/IEffectsFactory.hal
+++ b/audio/effect/4.0/IEffectsFactory.hal
@@ -55,16 +55,4 @@ interface IEffectsFactory {
      */
     createEffect(Uuid uid, AudioSession session, AudioIoHandle ioHandle)
         generates (Result retval, IEffect result, uint64_t effectId);
-
-    /**
-     * Dumps information about effects into the provided file descriptor.
-     * This is used for the dumpsys facility.
-     * The implementation should not block as the caller might have time
-     * constraint on the dump.
-     * A back to back dump of all HAL Device and Stream should take under 100ms.
-     *
-     * @param fd dump file descriptor.
-     * @return retval operation completion status: OK or NOT_SUPPORTED.
-     */
-    debugDump(handle fd) generates (Result retval);
 };