Update Dialer to v10 RC32

This release was created following the instructions at:
go/dialer-aosp-release

Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.

Version: 10
Candidate: RC32
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC32

This release contains the following bug fixes since RC17:
Bug: 33176679 33272455 3646510 36773894 37297649 37413780
37513689 37640315 37680595 37698062 37873639 37901752
37919295 37953423 38062852 38069600 38137349 38173549
38180252 38191514

Test: make, on device
Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a

1 files changed, 14 insertions, 5 deletions

diff --git a/java/com/android/contacts/common/list/DirectoryListLoader.java b/java/com/android/contacts/common/list/DirectoryListLoader.java
index 48b098c07..be62cc7a8 100644
--- a/java/com/android/contacts/common/list/DirectoryListLoader.java
+++ b/java/com/android/contacts/common/list/DirectoryListLoader.java
@@ -25,9 +25,10 @@ import android.net.Uri;
 import android.os.Handler;
 import android.provider.ContactsContract.Directory;
 import android.text.TextUtils;
-import android.util.Log;
 import com.android.contacts.common.R;
 import com.android.contacts.common.compat.DirectoryCompat;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.util.PermissionsUtil;
 
 /** A specialized loader for the list of directories, see {@link Directory}. */
 public class DirectoryListLoader extends AsyncTaskLoader<Cursor> {
@@ -38,7 +39,6 @@ public class DirectoryListLoader extends AsyncTaskLoader<Cursor> {
   public static final int SEARCH_MODE_DATA_SHORTCUT = 3;
   // This is a virtual column created for a MatrixCursor.
   public static final String DIRECTORY_TYPE = "directoryType";
-  private static final String TAG = "ContactEntryListAdapter";
   private static final String[] RESULT_PROJECTION = {
     Directory._ID, DIRECTORY_TYPE, Directory.DISPLAY_NAME, Directory.PHOTO_SUPPORT,
   };
@@ -71,7 +71,13 @@ public class DirectoryListLoader extends AsyncTaskLoader<Cursor> {
 
   @Override
   protected void onStartLoading() {
-    getContext().getContentResolver().registerContentObserver(DirectoryQuery.URI, false, mObserver);
+    if (PermissionsUtil.hasContactsReadPermissions(getContext())) {
+      getContext()
+          .getContentResolver()
+          .registerContentObserver(DirectoryQuery.URI, false, mObserver);
+    } else {
+      LogUtil.w("DirectoryListLoader.onStartLoading", "contacts permission not available.");
+    }
     forceLoad();
   }
 
@@ -141,7 +147,9 @@ public class DirectoryListLoader extends AsyncTaskLoader<Cursor> {
           try {
             directoryType = pm.getResourcesForApplication(packageName).getString(typeResourceId);
           } catch (Exception e) {
-            Log.e(TAG, "Cannot obtain directory type from package: " + packageName);
+            LogUtil.e(
+                "ContactEntryListAdapter.loadInBackground",
+                "cannot obtain directory type from package: " + packageName);
           }
         }
         String displayName = cursor.getString(DirectoryQuery.DISPLAY_NAME);
@@ -149,7 +157,8 @@ public class DirectoryListLoader extends AsyncTaskLoader<Cursor> {
         result.addRow(new Object[] {directoryId, directoryType, displayName, photoSupport});
       }
     } catch (RuntimeException e) {
-      Log.w(TAG, "Runtime Exception when querying directory");
+      LogUtil.w(
+          "ContactEntryListAdapter.loadInBackground", "runtime exception when querying directory");
     } finally {
       if (cursor != null) {
         cursor.close();