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

Commit 92be2707 authored by Eric Erfanian's avatar Eric Erfanian Committed by android-build-merger
Browse files

Merge changes Ibab0bc7e,I1cb26187,I64225b78,I4806ab65,I7d431e74, ... am: 84b862ac 

am: e2c2c5b7

Change-Id: Ie7aa64c20c7f8a0d792812fb0c062f870bd2abe3
parents 26b5e5dd e2c2c5b7

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

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

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.

  public static final String EVENT_REQUEST_HANDOVER = "android.telecom.event.REQUEST_HANDOVER";

  public static final String EXTRA_HANDOVER_PHONE_ACCOUNT_HANDLE =

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

+0 −2
Original line number 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.storage.StorageComponent;

import com.android.dialer.strictmode.StrictModeComponent;

import com.android.incallui.audiomode.BluetoothDeviceProviderComponent;

import com.android.incallui.calllocation.CallLocationComponent;

import com.android.incallui.maps.MapsComponent;

import com.android.incallui.speakeasy.SpeakEasyComponent;
@@ -53,7 +52,6 @@ import com.android.voicemail.VoicemailComponent; 
 */

public interface BaseDialerRootComponent

    extends ActiveCallsComponent.HasComponent,

        BluetoothDeviceProviderComponent.HasComponent,

        BubbleComponent.HasComponent,

        CallLocationComponent.HasComponent,

        CallLogComponent.HasComponent,

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

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

    numberView.setText(headerInfo.getSecondaryText());



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



    setCallbackAction(callbackAction);

  }

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

+0 −2
Original line number Diff line number Diff line
@@ -31,6 +31,4 @@ message CallDetailsHeaderInfo { 
  //   "Blocked • Mobile • 555-1234", and

  //   "Spam • Mobile • 555-1234".

  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 Diff line number Diff line
@@ -268,6 +268,7 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder { 
  private void setOnClickListenerForRow(CoalescedRow row) {

    if (!PhoneNumberHelper.canPlaceCallsTo(

        row.getNumber().getNormalizedNumber(), row.getNumberPresentation())) {

      itemView.setOnClickListener(null);

      return;

    }

    itemView.setOnClickListener(view -> CallLogRowActions.startCallForRow(activity, row));