This change reflects the Dialer V10 RC00 branch.

RC00 is based on:
branch: dialer-android_release_branch/153304843.1
synced to: 153304843

following the instructions at go/dialer-aosp-release.

In this release:

* Removes final apache sources.
* Uses native lite compilation.

More drops will follow with subsequent release candidates
until we reach our final v10 release, in cadence with our
prebuilt drops.

Test: TreeHugger, on device
Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f

1 files changed, 4 insertions, 24 deletions

diff --git a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
index e589a6882..2aed9e75e 100644
--- a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
+++ b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
@@ -18,13 +18,11 @@ package com.android.dialer.phonenumbercache;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
+import com.android.dialer.logging.ContactSource;
 import java.io.InputStream;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 
 public interface CachedNumberLookupService {
 
@@ -47,9 +45,9 @@ public interface CachedNumberLookupService {
 
   boolean isCacheUri(String uri);
 
-  boolean isBusiness(int sourceType);
+  boolean isBusiness(ContactSource.Type sourceType);
 
-  boolean canReportAsInvalid(int sourceType, String objectId);
+  boolean canReportAsInvalid(ContactSource.Type sourceType, String objectId);
 
   /** @return return {@link Uri} to the photo or return {@code null} when failing to add photo */
   @Nullable
@@ -64,28 +62,10 @@ public interface CachedNumberLookupService {
 
   interface CachedContactInfo {
 
-    int SOURCE_TYPE_DIRECTORY = 1;
-    int SOURCE_TYPE_EXTENDED = 2;
-    int SOURCE_TYPE_PLACES = 3;
-    int SOURCE_TYPE_PROFILE = 4;
-    int SOURCE_TYPE_CNAP = 5;
-    int SOURCE_TYPE_CEQUINT_CALLER_ID = 6;
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({
-      SOURCE_TYPE_DIRECTORY,
-      SOURCE_TYPE_EXTENDED,
-      SOURCE_TYPE_PLACES,
-      SOURCE_TYPE_PROFILE,
-      SOURCE_TYPE_CNAP,
-      SOURCE_TYPE_CEQUINT_CALLER_ID
-    })
-    public @interface ContactSourceType {}
-
     @NonNull
     ContactInfo getContactInfo();
 
-    void setSource(@ContactSourceType int sourceType, String name, long directoryId);
+    void setSource(ContactSource.Type sourceType, String name, long directoryId);
 
     void setDirectorySource(String name, long directoryId);