Merge tag 'LA.QSSI.13.0.r1-11300.01-qssi.0' into tachibana-mr1

LA.QSSI.13.0.r1-11300.01-qssi.0

Change-Id: Ia12a1170bfd054f140895ef29379c29a1ead6d05

2 files changed, 6 insertions, 14 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();
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;