From 4631d24e79bfe1c90133f551824ebc8e5a1da86e Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Mon, 25 Apr 2022 08:23:52 +0000
Subject: [PATCH] [Media Device] Add null check to avoid npe for compareTo
 method

Bug: 217583408
Test: N/A
Change-Id: Id3873bc79eb8200379cf63b7945fb37c4d963517
---
 .../src/com/android/settingslib/media/MediaDevice.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
index 2fb534ddfe96d..15cc8533ebce9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
@@ -323,6 +323,9 @@ public abstract class MediaDevice implements Comparable<MediaDevice> {
      */
     @Override
     public int compareTo(MediaDevice another) {
+        if (another == null) {
+            return -1;
+        }
         // Check Bluetooth device is have same connection state
         if (isConnected() ^ another.isConnected()) {
             if (isConnected()) {