1 files changed, 6 insertions, 81 deletions

diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java
index 12b4914a3a13..8961a5a05546 100644
--- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java
+++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java
@@ -47,7 +47,6 @@ import android.os.RemoteCallbackList;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.UserHandle;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.PrintWriterPrinter;
@@ -64,11 +63,8 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
-/**
- * @hide
- * (non final for mocking/spying)
- */
-public class AudioDeviceBroker {
+/** @hide */
+/*package*/ final class AudioDeviceBroker {
 
     private static final String TAG = "AS.AudioDeviceBroker";
 
@@ -746,8 +742,8 @@ public class AudioDeviceBroker {
     }
 
     /*package*/ void registerStrategyPreferredDevicesDispatcher(
-            @NonNull IStrategyPreferredDevicesDispatcher dispatcher, boolean isPrivileged) {
-        mDeviceInventory.registerStrategyPreferredDevicesDispatcher(dispatcher, isPrivileged);
+            @NonNull IStrategyPreferredDevicesDispatcher dispatcher) {
+        mDeviceInventory.registerStrategyPreferredDevicesDispatcher(dispatcher);
     }
 
     /*package*/ void unregisterStrategyPreferredDevicesDispatcher(
@@ -765,8 +761,8 @@ public class AudioDeviceBroker {
     }
 
     /*package*/ void registerCapturePresetDevicesRoleDispatcher(
-            @NonNull ICapturePresetDevicesRoleDispatcher dispatcher, boolean isPrivileged) {
-        mDeviceInventory.registerCapturePresetDevicesRoleDispatcher(dispatcher, isPrivileged);
+            @NonNull ICapturePresetDevicesRoleDispatcher dispatcher) {
+        mDeviceInventory.registerCapturePresetDevicesRoleDispatcher(dispatcher);
     }
 
     /*package*/ void unregisterCapturePresetDevicesRoleDispatcher(
@@ -774,11 +770,6 @@ public class AudioDeviceBroker {
         mDeviceInventory.unregisterCapturePresetDevicesRoleDispatcher(dispatcher);
     }
 
-    /* package */ List<AudioDeviceAttributes> anonymizeAudioDeviceAttributesListUnchecked(
-            List<AudioDeviceAttributes> devices) {
-        return mAudioService.anonymizeAudioDeviceAttributesListUnchecked(devices);
-    }
-
     /*package*/ void registerCommunicationDeviceDispatcher(
             @NonNull ICommunicationDeviceDispatcher dispatcher) {
         mCommDevDispatchers.register(dispatcher);
@@ -1424,9 +1415,6 @@ public class AudioDeviceBroker {
                     final int capturePreset = msg.arg1;
                     mDeviceInventory.onSaveClearPreferredDevicesForCapturePreset(capturePreset);
                 } break;
-                case MSG_PERSIST_AUDIO_DEVICE_SETTINGS:
-                    onPersistAudioDeviceSettings();
-                    break;
                 default:
                     Log.wtf(TAG, "Invalid message " + msg.what);
             }
@@ -1508,8 +1496,6 @@ public class AudioDeviceBroker {
     private static final int MSG_IL_SET_PREF_DEVICES_FOR_STRATEGY = 40;
     private static final int MSG_I_REMOVE_PREF_DEVICES_FOR_STRATEGY = 41;
 
-    private static final int MSG_PERSIST_AUDIO_DEVICE_SETTINGS = 54;
-
     private static boolean isMessageHandledUnderWakelock(int msgId) {
         switch(msgId) {
             case MSG_L_SET_WIRED_DEVICE_CONNECTION_STATE:
@@ -1856,65 +1842,4 @@ public class AudioDeviceBroker {
         }
         return null;
     }
-
-    /**
-     * post a message to persist the audio device settings.
-     * Message is delayed by 1s on purpose in case of successive changes in quick succession (at
-     * init time for instance)
-     * Note this method is made public to work around a Mockito bug where it needs to be public
-     * in order to be mocked by a test a the same package
-     * (see https://code.google.com/archive/p/mockito/issues/127)
-     */
-    public void persistAudioDeviceSettings() {
-        sendMsg(MSG_PERSIST_AUDIO_DEVICE_SETTINGS, SENDMSG_REPLACE, /*delay*/ 1000);
-    }
-
-    void onPersistAudioDeviceSettings() {
-        final String deviceSettings = mDeviceInventory.getDeviceSettings();
-        Log.v(TAG, "saving audio device settings: " + deviceSettings);
-        boolean res = Settings.Secure.putStringForUser(
-                mAudioService.getContentResolver(), Settings.Secure.AUDIO_DEVICE_INVENTORY,
-                deviceSettings, UserHandle.USER_CURRENT);
-
-        if (!res) {
-            Log.e(TAG, "error saving audio device settings: " + deviceSettings);
-        }
-    }
-
-    void onReadAudioDeviceSettings() {
-        final ContentResolver contentResolver = mAudioService.getContentResolver();
-        String settings = Settings.Secure.getStringForUser(contentResolver,
-                Settings.Secure.AUDIO_DEVICE_INVENTORY, UserHandle.USER_CURRENT);
-        if (settings != null && !settings.equals("")) {
-            setDeviceSettings(settings);
-        }
-    }
-
-    void setDeviceSettings(String settings) {
-        mDeviceInventory.setDeviceSettings(settings);
-    }
-
-    /** Test only method. */
-    String getDeviceSettings() {
-        return mDeviceInventory.getDeviceSettings();
-    }
-
-    List<AdiDeviceState> getImmutableDeviceInventory() {
-        return mDeviceInventory.getImmutableDeviceInventory();
-    }
-
-    void addDeviceStateToInventory(AdiDeviceState deviceState) {
-        mDeviceInventory.addDeviceStateToInventory(deviceState);
-    }
-
-    AdiDeviceState findDeviceStateForAudioDeviceAttributes(AudioDeviceAttributes ada,
-            int canonicalType) {
-        return mDeviceInventory.findDeviceStateForAudioDeviceAttributes(ada, canonicalType);
-    }
-
-    //------------------------------------------------
-    // for testing purposes only
-    void clearDeviceInventory() {
-        mDeviceInventory.clearDeviceInventory();
-    }
 }