diff options
author | zachh <zachh@google.com> | 2017-11-17 12:50:52 -0800 |
---|---|---|
committer | zachh <zachh@google.com> | 2017-11-18 07:35:42 +0000 |
commit | a430bba3873f556ba895b172a32048030fa7f4d0 (patch) | |
tree | f5f454ee37b10fd93191a93647fdba241fb5785c /java/com/android/dialer/searchfragment/remote | |
parent | 7e1a0d155eecc8a407e11f91605db135911c8eb6 (diff) |
Automated rollback of changelist 174944384
Bug: 68942044
Test: NO
PiperOrigin-RevId: 176147553
Change-Id: Ia22751f02cdd621c2095e8e476a3077db2c541fa
Diffstat (limited to 'java/com/android/dialer/searchfragment/remote')
-rw-r--r-- | java/com/android/dialer/searchfragment/remote/RemoteDirectoriesCursorLoader.java | 17 |
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(); } } |