diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-09 01:46:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-09 01:46:28 +0000 |
| commit | 20ebcdca46e6be68050cd44087f0f768f5dae5c6 (patch) | |
| tree | 5bc845fb459a8958ec9c5a055d12a84c92b23443 /java/com/android/dialer/simulator | |
| parent | d806c2321eba63fa6d8f28471ab48847b8b6e92c (diff) | |
| parent | 77c2b4c1711cee43b69d54bf180e14ccda70e92f (diff) | |
Merge changes I220cb741,I471b2d19
* changes:
Add "Set up" and "Invite" for video to call log entry actions
Fix voicemail populator bug and change emergency call to emergency call back.
Diffstat (limited to 'java/com/android/dialer/simulator')
| -rw-r--r-- | java/com/android/dialer/simulator/impl/SimulatorNotifications.java | 1 | ||||
| -rw-r--r-- | java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/com/android/dialer/simulator/impl/SimulatorNotifications.java b/java/com/android/dialer/simulator/impl/SimulatorNotifications.java index 4ed7c9b8f..a243c34c3 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorNotifications.java +++ b/java/com/android/dialer/simulator/impl/SimulatorNotifications.java @@ -56,6 +56,7 @@ final class SimulatorNotifications { .setTranscription(String.format("Short transcript %d", i)) .setDurationSeconds(60) .setIsRead(false) + .setPhoneAccountComponentName("") .setTimeMillis(System.currentTimeMillis() - TimeUnit.HOURS.toMillis(i)) .build(); voicemails.add(voicemail.getAsContentValues(context)); diff --git a/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java b/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java index 451896b73..9ffcfc8a8 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java +++ b/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java @@ -39,7 +39,8 @@ final class SimulatorVoiceCall .addItem("Incoming call", () -> new SimulatorVoiceCall(context).addNewIncomingCall(false)) .addItem("Outgoing call", () -> new SimulatorVoiceCall(context).addNewOutgoingCall()) .addItem("Spam call", () -> new SimulatorVoiceCall(context).addNewIncomingCall(true)) - .addItem("Emergency call", () -> new SimulatorVoiceCall(context).addNewEmergencyCall()) + .addItem( + "Emergency call back", () -> new SimulatorVoiceCall(context).addNewEmergencyCallBack()) .addItem( "GSM conference", () -> new SimulatorConferenceCreator(context, Simulator.CONFERENCE_TYPE_GSM).start(5)) @@ -71,7 +72,7 @@ final class SimulatorVoiceCall SimulatorSimCallManager.addNewOutgoingCall(context, callerId, false /* isVideo */); } - private void addNewEmergencyCall() { + private void addNewEmergencyCallBack() { String callerId = "911"; connectionTag = SimulatorSimCallManager.addNewIncomingCall(context, callerId, false); } |