Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 806080dd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "[Media Device] Add null check to avoid npe for compareTo method" into tm-dev am: 75948e85 am: 6213b3aa am: 7a3fbbc0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938076



Change-Id: I841a670eb812ad06fbeb368e7592d0de15844a66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d78e84c 7a3fbbc0

packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java

+3 −0
Original line number Diff line number Diff line
@@ -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()) {