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

Commit e97ac1df 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: 79c2f4d3

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



Change-Id: Ic41d2e1895b208a2459b9ea3706c5c881284d730
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a0e7280 79c2f4d3

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()) {