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

Commit e2a03526 authored May 08, 2018 by android-build-team Robot

Snap for 4767896 from d85e80c6 to qt-release

Change-Id: I92dec96fb32da4c3b36313dadb365d9c62dc51ff

parents c949f58d d85e80c6

java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -23,11 +23,6 @@ import java.lang.reflect.Field;
	/** Compatibility class for {@link android.telecom.TelecomManager}. */		/** Compatibility class for {@link android.telecom.TelecomManager}. */
	public class TelecomManagerCompat {		public class TelecomManagerCompat {

	// TODO(mdooley): remove once this is available in android.telecom.Call
	// a bug
	public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS =
	"android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";

	// Constants from http://cs/android/frameworks/base/telecomm/java/android/telecom/Call.java.		// Constants from http://cs/android/frameworks/base/telecomm/java/android/telecom/Call.java.
	public static final String EVENT_REQUEST_HANDOVER = "android.telecom.event.REQUEST_HANDOVER";		public static final String EVENT_REQUEST_HANDOVER = "android.telecom.event.REQUEST_HANDOVER";
	public static final String EXTRA_HANDOVER_PHONE_ACCOUNT_HANDLE =		public static final String EXTRA_HANDOVER_PHONE_ACCOUNT_HANDLE =

java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,6 @@ import com.android.dialer.spam.SpamComponent;
	import com.android.dialer.speeddial.loader.UiItemLoaderComponent;		import com.android.dialer.speeddial.loader.UiItemLoaderComponent;
	import com.android.dialer.storage.StorageComponent;		import com.android.dialer.storage.StorageComponent;
	import com.android.dialer.strictmode.StrictModeComponent;		import com.android.dialer.strictmode.StrictModeComponent;
	import com.android.incallui.audiomode.BluetoothDeviceProviderComponent;
	import com.android.incallui.calllocation.CallLocationComponent;		import com.android.incallui.calllocation.CallLocationComponent;
	import com.android.incallui.maps.MapsComponent;		import com.android.incallui.maps.MapsComponent;
	import com.android.incallui.speakeasy.SpeakEasyComponent;		import com.android.incallui.speakeasy.SpeakEasyComponent;
	@@ -53,7 +52,6 @@ import com.android.voicemail.VoicemailComponent;
	*/		*/
	public interface BaseDialerRootComponent		public interface BaseDialerRootComponent
	extends ActiveCallsComponent.HasComponent,		extends ActiveCallsComponent.HasComponent,
	BluetoothDeviceProviderComponent.HasComponent,
	BubbleComponent.HasComponent,		BubbleComponent.HasComponent,
	CallLocationComponent.HasComponent,		CallLocationComponent.HasComponent,
	CallLogComponent.HasComponent,		CallLogComponent.HasComponent,

java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -192,8 +192,6 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder
	nameView.setText(headerInfo.getPrimaryText());		nameView.setText(headerInfo.getPrimaryText());
	numberView.setText(headerInfo.getSecondaryText());		numberView.setText(headerInfo.getSecondaryText());

	// TODO(a bug): show SIM info in the TextView returned by getNetworkView().

	setCallbackAction(callbackAction);		setCallbackAction(callbackAction);
	}		}

java/com/android/dialer/calldetails/proto/call_details_header_info.proto

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,4 @@ message CallDetailsHeaderInfo {
	// "Blocked • Mobile • 555-1234", and		// "Blocked • Mobile • 555-1234", and
	// "Spam • Mobile • 555-1234".		// "Spam • Mobile • 555-1234".
	optional string secondary_text = 4;		optional string secondary_text = 4;

	// TODO(a bug): Add SIM info.
	}		}
	No newline at end of file

java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -268,6 +268,7 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder {
	private void setOnClickListenerForRow(CoalescedRow row) {		private void setOnClickListenerForRow(CoalescedRow row) {
	if (!PhoneNumberHelper.canPlaceCallsTo(		if (!PhoneNumberHelper.canPlaceCallsTo(
	row.getNumber().getNormalizedNumber(), row.getNumberPresentation())) {		row.getNumber().getNormalizedNumber(), row.getNumberPresentation())) {
			itemView.setOnClickListener(null);
	return;		return;
	}		}
	itemView.setOnClickListener(view -> CallLogRowActions.startCallForRow(activity, row));		itemView.setOnClickListener(view -> CallLogRowActions.startCallForRow(activity, row));