diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-12 02:48:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-12 02:48:25 +0000 |
commit | 6bd659e6e90346f58ed08f6c127835a320bbd2e4 (patch) | |
tree | b90e5f582dcab0d3ad6393f4ffbc7a4dd78e81dc /java/com/android/dialer/voicemail/model/VoicemailEntry.java | |
parent | 58bade2ace277dff4db3bbbfa2e07015f0f7c6ad (diff) | |
parent | 01aac5de58903555a089d16a58b9346d34d54e7b (diff) |
Merge changes I2e091371,I4e0bc1c6,I24063ee4
* changes:
Implement PhoneLookup for CP2 remote contacts
Merge PhoneLookupDataSource results into a proto in annotated call log.
Attempt to place call even call permission is missing
Diffstat (limited to 'java/com/android/dialer/voicemail/model/VoicemailEntry.java')
-rw-r--r-- | java/com/android/dialer/voicemail/model/VoicemailEntry.java | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/java/com/android/dialer/voicemail/model/VoicemailEntry.java b/java/com/android/dialer/voicemail/model/VoicemailEntry.java index 702f52d17..f17a23e54 100644 --- a/java/com/android/dialer/voicemail/model/VoicemailEntry.java +++ b/java/com/android/dialer/voicemail/model/VoicemailEntry.java @@ -19,6 +19,7 @@ package com.android.dialer.voicemail.model; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.android.dialer.DialerPhoneNumber; +import com.android.dialer.NumberAttributes; import com.google.auto.value.AutoValue; /** Data class containing the contents of a voicemail entry from the AnnotatedCallLog. */ @@ -30,7 +31,7 @@ public abstract class VoicemailEntry { .setId(0) .setTimestamp(0) .setNumber(DialerPhoneNumber.getDefaultInstance()) - .setPhotoId(0) + .setNumberAttributes(NumberAttributes.getDefaultInstance()) .setDuration(0) .setCallType(0) .setIsRead(0); @@ -43,21 +44,11 @@ public abstract class VoicemailEntry { @NonNull public abstract DialerPhoneNumber number(); - @Nullable - public abstract String name(); @Nullable public abstract String formattedNumber(); @Nullable - public abstract String photoUri(); - - public abstract long photoId(); - - @Nullable - public abstract String lookupUri(); - - @Nullable public abstract String geocodedLocation(); public abstract long duration(); @@ -72,6 +63,8 @@ public abstract class VoicemailEntry { public abstract int isRead(); + public abstract NumberAttributes numberAttributes(); + /** Builder for {@link VoicemailEntry}. */ @AutoValue.Builder public abstract static class Builder { @@ -82,16 +75,8 @@ public abstract class VoicemailEntry { public abstract Builder setNumber(@NonNull DialerPhoneNumber number); - public abstract Builder setName(@Nullable String name); - public abstract Builder setFormattedNumber(@Nullable String formattedNumber); - public abstract Builder setPhotoUri(@Nullable String photoUri); - - public abstract Builder setPhotoId(long photoId); - - public abstract Builder setLookupUri(@Nullable String lookupUri); - public abstract Builder setDuration(long duration); public abstract Builder setTranscription(@Nullable String transcription); @@ -104,6 +89,8 @@ public abstract class VoicemailEntry { public abstract Builder setIsRead(int isRead); + public abstract Builder setNumberAttributes(NumberAttributes numberAttributes); + public abstract VoicemailEntry build(); } } |