Merge changes Iee4e3db8,I6e74c7fe,Ibe722477,Ia22751f0,Ic28fb197, ...

* changes:
  DialpadView cleanup.
  Merge the following methods in InCallActivityCommon into InCallActivity:
  Add contact source options.
  Automated rollback of changelist 174944384
  Refactoring and adding TOS check before transcribing
  Adding exponential backoff utilities
  Implement suggested SIM
  Fix dialer simulator for conference calling funcitonality. Updated the following contents: 1.Fix the order of spawning connections for GSM conference. 2.Make VOLTE conference call more realistic. 3.Fix minor bugs about simulator. 4.Add SimulatorConnectionsBank class to store connection tags created by simulator. 5.Fix tests influenced by SimulatorConnectionsBank.

1 files changed, 2 insertions, 15 deletions

diff --git a/java/com/android/dialer/searchfragment/remote/RemoteDirectoriesCursorLoader.java b/java/com/android/dialer/searchfragment/remote/RemoteDirectoriesCursorLoader.java
index 3d16c4351..de71025cd 100644
--- a/java/com/android/dialer/searchfragment/remote/RemoteDirectoriesCursorLoader.java
+++ b/java/com/android/dialer/searchfragment/remote/RemoteDirectoriesCursorLoader.java
@@ -36,14 +36,12 @@ public final class RemoteDirectoriesCursorLoader extends CursorLoader {
 
   private static final int DISPLAY_NAME = 1;
   private static final int PHOTO_SUPPORT = 2;
-  private static final int AUTHORITY = 3;
 
   @VisibleForTesting
   static final String[] PROJECTION = {
     ContactsContract.Directory._ID,
     ContactsContract.Directory.DISPLAY_NAME,
     ContactsContract.Directory.PHOTO_SUPPORT,
-    ContactsContract.Directory.DIRECTORY_AUTHORITY,
   };
 
   public RemoteDirectoriesCursorLoader(Context context) {
@@ -53,10 +51,7 @@ public final class RemoteDirectoriesCursorLoader extends CursorLoader {
   /** @return current cursor row represented as a {@link Directory}. */
   public static Directory readDirectory(Cursor cursor) {
     return Directory.create(
-        cursor.getInt(ID),
-        cursor.getString(DISPLAY_NAME),
-        cursor.getInt(PHOTO_SUPPORT) != 0,
-        cursor.getString(AUTHORITY));
+        cursor.getInt(ID), cursor.getString(DISPLAY_NAME), cursor.getInt(PHOTO_SUPPORT) != 0);
   }
 
   private static Uri getContentUri() {
@@ -68,14 +63,8 @@ public final class RemoteDirectoriesCursorLoader extends CursorLoader {
   /** POJO representing the results returned from {@link RemoteDirectoriesCursorLoader}. */
   @AutoValue
   public abstract static class Directory {
-    public static Directory create(
-        int id, @Nullable String displayName, boolean supportsPhotos, @Nullable String authority) {
-      return new AutoValue_RemoteDirectoriesCursorLoader_Directory(
-          id, displayName, supportsPhotos, authority);
-    }
-
     public static Directory create(int id, @Nullable String displayName, boolean supportsPhotos) {
-      return create(id, displayName, supportsPhotos, null);
+      return new AutoValue_RemoteDirectoriesCursorLoader_Directory(id, displayName, supportsPhotos);
     }
 
     public abstract int getId();
@@ -84,7 +73,5 @@ public final class RemoteDirectoriesCursorLoader extends CursorLoader {
     abstract @Nullable String getDisplayName();
 
     abstract boolean supportsPhotos();
-
-    abstract @Nullable String authority();
   }
 }