[automerger] Fix for Developer options app closing unexpectedly if the codec type is invalid am: 6f0a898bcb

Change-Id: I2b201238dff2928b3b517c627de1e5ac6e4c7323

1 files changed, 5 insertions, 0 deletions

diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
index c0143ba82a..c534a9d786 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
@@ -164,6 +164,11 @@ public abstract class AbstractBluetoothDialogPreferenceController extends
             Log.d(TAG, "Unable to get current codec config. Codec status is null");
             return null;
         }
+        if (codecStatus.getCodecConfig().getCodecType() >=
+            BluetoothCodecConfig.SOURCE_CODEC_TYPE_MAX) {
+            Log.d(TAG,"Invalid codec type");
+            return null;
+        }
         return codecStatus.getCodecConfig();
     }