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

Commit e5de3394 authored Jul 24, 2018 by Romain Hunault

Merge branch 'cm-14.1' into eelo-0.1

parents b8a11b02 97492765

core/java/android/bluetooth/BluetoothDevice.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -727,7 +727,11 @@ public final class BluetoothDevice implements Parcelable {
		return null;
		}
		try {
		return sService.getRemoteName(this);
		String name = sService.getRemoteName(this);
		if (name != null) {
		return name.replaceAll("[\\t\\n\\r]+", " ");
		}
		return null;
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return null;
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -362,8 +362,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		if (visible) {
		if (isTargetCustom(Shortcuts.LEFT_SHORTCUT)) {
		visible = !mShortcutHelper.isTargetEmpty(Shortcuts.LEFT_SHORTCUT);
		} else {
		} else if (canLaunchVoiceAssist()) {
		// Display left shortcut
		} else {
		visible = isPhoneVisible();
		}
		}
		mLeftAffordanceView.setVisibility(visible ? View.VISIBLE : View.GONE);