diff options
| author | 2018-11-09 13:13:31 -0800 | |
|---|---|---|
| committer | 2018-11-09 13:13:31 -0800 | |
| commit | 5efda82dada66d807133ae9303a1cf4bb415696e (patch) | |
| tree | 1716287ad718112cb863a4aaf78afeba469e3c8e | |
| parent | 8f4ef07a872f4b10e38ded69ad516826f981b5c2 (diff) | |
| parent | 305869b27ec726aed77423b3f78b466290d6cfeb (diff) | |
Merge "CameraServiceProxy: Notify audio service of camera facing" into pi-dev am: aec845ed2a
am: 305869b27e
Change-Id: Icb688bad0355af4b2f1e98f4764bc2c4a488f255
| -rw-r--r-- | services/core/java/com/android/server/camera/CameraServiceProxy.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/camera/CameraServiceProxy.java b/services/core/java/com/android/server/camera/CameraServiceProxy.java index 0ee55ed2e832..527539d8ce0d 100644 --- a/services/core/java/com/android/server/camera/CameraServiceProxy.java +++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java @@ -21,6 +21,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.hardware.ICameraService; import android.hardware.ICameraServiceProxy; +import android.media.AudioManager; import android.metrics.LogMaker; import android.nfc.INfcAdapter; import android.os.Binder; @@ -393,6 +394,19 @@ public class CameraServiceProxy extends SystemService boolean wasEmpty = mActiveCameraUsage.isEmpty(); switch (newCameraState) { case ICameraServiceProxy.CAMERA_STATE_OPEN: + // Notify the audio subsystem about the facing of the most-recently opened + // camera This can be used to select the best audio tuning in case video + // recording with that camera will happen. Since only open events are used, if + // multiple cameras are opened at once, the one opened last will be used to + // select audio tuning. + AudioManager audioManager = getContext().getSystemService(AudioManager.class); + if (audioManager != null) { + // Map external to front for audio tuning purposes + String facingStr = (facing == ICameraServiceProxy.CAMERA_FACING_BACK) ? + "back" : "front"; + String facingParameter = "cameraFacing=" + facingStr; + audioManager.setParameters(facingParameter); + } break; case ICameraServiceProxy.CAMERA_STATE_ACTIVE: CameraUsageEvent newEvent = new CameraUsageEvent(facing, clientName, apiLevel); |