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

Commit c54f7e16 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE

Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: I4826d32c3aae06b61a992985d127320efbe96289
parents abaa3e7f 730dd566
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -1340,7 +1340,10 @@ public final class BluetoothDevice implements Parcelable, Attributable {
            if (alias == null) {
                return getName();
            }
            return alias;
            return alias
                    .replace('\t', ' ')
                    .replace('\n', ' ')
                    .replace('\r', ' ');
        } catch (RemoteException e) {
            Log.e(TAG, "", e);
        }