Merge "[Media Device] Add null check to avoid npe for compareTo method" into tm-dev

2022-04-29 17:17:30 +00:00
parent 80017b1f2f 4631d24e79
commit 75948e85b8
1 changed files with 3 additions and 0 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
@@ -332,6 +332,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()) {