From 78513937c0e9130c0b0bbbbe988f730188c5f830 Mon Sep 17 00:00:00 2001 From: Satish Kumar Kodishala Date: Thu, 6 Jul 2023 21:08:06 +0530 Subject: Revert "Don't honor startBluetoothSco/stopBluetoothSco when BT is OFF" This reverts commit 424eeadb9f83093f8cef1449a63beaeb87bfac81. CRs-Fixed: 3547860 Change-Id: I5978a42606e6ff8a1a5fdfee8557c46d1aa62a9a --- services/core/java/com/android/server/audio/AudioService.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 17ccc4fd89af..807ba747a011 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -6222,11 +6222,6 @@ public class AudioService extends IAudioService.Stub /** @see AudioManager#startBluetoothSco() */ public void startBluetoothSco(IBinder cb, int targetSdkVersion) { Log.i(TAG, "In startBluetoothSco()"); - BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); - if ((adapter == null) || (adapter.getState() != BluetoothAdapter.STATE_ON)) { - Log.i(TAG, "startBluetoothSco(), BT is not turned ON or adapter is null"); - return; - } if (!checkAudioSettingsPermission("startBluetoothSco()")) { return; } @@ -6295,11 +6290,6 @@ public class AudioService extends IAudioService.Stub /** @see AudioManager#stopBluetoothSco() */ public void stopBluetoothSco(IBinder cb){ Log.i(TAG, "In stopBluetoothSco()"); - BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); - if ((adapter == null) || (adapter.getState() != BluetoothAdapter.STATE_ON)) { - Log.i(TAG, "stopBluetoothSco(), BT is not turned ON or adapter is null"); - return; - } if (!checkAudioSettingsPermission("stopBluetoothSco()") || !mSystemReady) { return; -- cgit v1.2.3 From 706e0e347ba45028b8f5a29d473e9604436412aa Mon Sep 17 00:00:00 2001 From: Malathi Gottam Date: Tue, 22 Aug 2023 02:04:24 +0530 Subject: Use encoder capabilities for determining screen recording size Using decoder capabilities for determining max size and rate can cause failure during screen record as encoder might not be capable of supporting it. As encoder supported size and rate are implicitly supported by decoder, recordings will be playable on device. CRs-Fixed: 3593702 Change-Id: I5c9eb491df248e6150cc956574ab609102db9ac9 --- .../com/android/systemui/screenrecord/ScreenMediaRecorder.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java index b8d96f774e02..3b4f28accd3e 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java @@ -209,11 +209,13 @@ public class ScreenMediaRecorder extends MediaProjection.Callback { throws IOException { String videoType = MediaFormat.MIMETYPE_VIDEO_AVC; - // Get max size from the decoder, to ensure recordings will be playable on device - MediaCodec decoder = MediaCodec.createDecoderByType(videoType); - MediaCodecInfo.VideoCapabilities vc = decoder.getCodecInfo() + // Get max size from the encoder, + // implicitly decoder supports this size and + // ensure recordings will be playable on device + MediaCodec encoder = MediaCodec.createEncoderByType(videoType); + MediaCodecInfo.VideoCapabilities vc = encoder.getCodecInfo() .getCapabilitiesForType(videoType).getVideoCapabilities(); - decoder.release(); + encoder.release(); // Check if we can support screen size as-is int width = vc.getSupportedWidths().getUpper(); -- cgit v1.2.3