From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Fri, 9 Jun 2017 14:16:05 +0000
Subject: 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
---
 java/com/android/contacts/common/ContactPhotoManagerImpl.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'java/com/android/contacts/common/ContactPhotoManagerImpl.java')

diff --git a/java/com/android/contacts/common/ContactPhotoManagerImpl.java b/java/com/android/contacts/common/ContactPhotoManagerImpl.java
index 28ecf3421..2e6ff9fdc 100644
--- a/java/com/android/contacts/common/ContactPhotoManagerImpl.java
+++ b/java/com/android/contacts/common/ContactPhotoManagerImpl.java
@@ -53,9 +53,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import com.android.contacts.common.util.BitmapUtil;
+import com.android.contacts.common.util.TrafficStatsTags;
 import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.constants.TrafficStatsTags;
 import com.android.dialer.util.PermissionsUtil;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -634,9 +634,8 @@ class ContactPhotoManagerImpl extends ContactPhotoManager implements Callback {
           }
           return true;
         }
-      default:
-        return false;
     }
+    return false;
   }
 
   public void ensureLoaderThread() {
-- 
cgit v1.2.3