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

Commit 6b54ec28 authored by Ze Li's avatar Ze Li Committed by Android (Google) Code Review
Browse files

Merge "[Bluetooth Diagnosis] Minor format fix" into main

parents 7b9ee772 5b0e3c08

packages/SettingsLib/src/com/android/settingslib/bluetooth/devicesettings/DeviceSettingIcon.java

+3 −1
Original line number Diff line number Diff line
@@ -160,7 +160,9 @@ public class DeviceSettingIcon implements Parcelable { 


    @Override

    public boolean equals(@Nullable Object obj) {

        if (!(obj instanceof DeviceSettingIcon other)) return false;

        if (!(obj instanceof DeviceSettingIcon other)) {

            return false;

        }

        return mDefaultIcon == other.mDefaultIcon

                && Objects.equals(mCustomizedIcon, other.mCustomizedIcon);

    }

packages/SettingsLib/src/com/android/settingslib/bluetooth/devicesettings/DeviceSettingType.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public @interface DeviceSettingType { 


    /** Device setting type is "help" preference. */

    int DEVICE_SETTING_TYPE_HELP = 4;

    /** Device setting type is banner preference. */



    /** Device setting type is banner preference. */

    int DEVICE_SETTING_TYPE_BANNER = 5;

}