From 738bb09adee2b56c99063a0264f8f76de393143b Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Fri, 5 May 2017 09:08:20 -0700
Subject: Update Dialer to v10 RC17

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: RC17
Branch: dialer-android_release_branch/153304843.1
dialer-android/dialer-android_20170416.00/dialer-android_20170416.00_RC17

This release contains the following bug fixes since RC16:
Bug: 37962346

Test: make, on device
Change-Id: I1852cc096ef242c7bfcd85b11f954ddb00903c39
---
 .../dialer/app/dialpad/SmartDialCursorLoader.java  | 28 ----------------------
 1 file changed, 28 deletions(-)

(limited to 'java/com/android/dialer/app/dialpad')

diff --git a/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java b/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java
index 2e3b0cf92..175360c2d 100644
--- a/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java
+++ b/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java
@@ -17,10 +17,7 @@
 package com.android.dialer.app.dialpad;
 
 import android.content.AsyncTaskLoader;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import com.android.contacts.common.list.PhoneNumberListAdapter.PhoneQuery;
@@ -46,8 +43,6 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> {
   private String mQuery;
   private SmartDialNameMatcher mNameMatcher;
 
-  private BroadcastReceiver mSmartDialUpdatedReceiver;
-
   private boolean mShowEmptyListForNullQuery = true;
 
   public SmartDialCursorLoader(Context context) {
@@ -124,19 +119,6 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> {
     Cursor oldCursor = mCursor;
     mCursor = cursor;
 
-    if (mSmartDialUpdatedReceiver == null) {
-      mSmartDialUpdatedReceiver =
-          new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-              onContentChanged();
-            }
-          };
-      mContext.registerReceiver(
-          mSmartDialUpdatedReceiver,
-          new IntentFilter(DialerDatabaseHelper.ACTION_SMART_DIAL_UPDATED));
-    }
-
     if (isStarted()) {
       /** If the Loader is in a started state, deliver the results to the client. */
       super.deliverResult(cursor);
@@ -171,11 +153,6 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> {
     /** Ensure the loader has been stopped. */
     onStopLoading();
 
-    if (mSmartDialUpdatedReceiver != null) {
-      mContext.unregisterReceiver(mSmartDialUpdatedReceiver);
-      mSmartDialUpdatedReceiver = null;
-    }
-
     /** Release all previously saved query results. */
     if (mCursor != null) {
       releaseResources(mCursor);
@@ -187,11 +164,6 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> {
   public void onCanceled(Cursor cursor) {
     super.onCanceled(cursor);
 
-    if (mSmartDialUpdatedReceiver != null) {
-      mContext.unregisterReceiver(mSmartDialUpdatedReceiver);
-      mSmartDialUpdatedReceiver = null;
-    }
-
     /** The load has been canceled, so we should release the resources associated with 'data'. */
     releaseResources(cursor);
   }
-- 
cgit v1.2.3