diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
| commit | cded3beaf28a703e1ef8f71bbc6836e6806c3736 (patch) | |
| tree | c1b5e8199b5996fc848e7455d04126b9cdbb3c39 /java/com/android/dialer/phonenumbercache/ContactInfo.java | |
| parent | c67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (diff) | |
Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"
This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.
Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.
Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
Diffstat (limited to 'java/com/android/dialer/phonenumbercache/ContactInfo.java')
| -rw-r--r-- | java/com/android/dialer/phonenumbercache/ContactInfo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/dialer/phonenumbercache/ContactInfo.java b/java/com/android/dialer/phonenumbercache/ContactInfo.java index aef7374e4..5546553f9 100644 --- a/java/com/android/dialer/phonenumbercache/ContactInfo.java +++ b/java/com/android/dialer/phonenumbercache/ContactInfo.java @@ -17,7 +17,7 @@ package com.android.dialer.phonenumbercache; import android.net.Uri; -import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.text.TextUtils; import com.android.contacts.common.ContactsUtils.UserType; import com.android.contacts.common.util.UriUtils; @@ -59,7 +59,7 @@ public class ContactInfo { public boolean isBadData; public String objectId; public @UserType long userType; - public @NonNull ContactSource.Type sourceType = ContactSource.Type.UNKNOWN_SOURCE_TYPE; + public @Nullable ContactSource.Type sourceType = ContactSource.Type.UNKNOWN_SOURCE_TYPE; /** * True if local contact exists. This is only used for Cequint Caller ID so it won't overwrite * photo if local contact exists. |