commit 07af764827a7d6d426f6097d3e769084968f84fd
author Chiao Cheng <chiaocheng@google.com> Fri Sep 14 12:05:14 2012 -0700
committer Chiao Cheng <chiaocheng@google.com> Fri Sep 14 12:05:14 2012 -0700
tree 794003a64f932ebe48d8d3e6d5d751b579fa53f6
parent 9d4f3b20793a007b4489547aa40fc1049d0d8fef

Switch to AsyncQueryHandler to NoNullAsyncQueryHandler.

To prevent random null cursors, changed all usages of AsyncQueryHandler to
NoNullAsyncQueryHandler.

Bug: 7012260
Change-Id: I0c3d9593a7b68eb0220a444a21f27b6282f94e07

src/com/android/dialer/SpecialCharSequenceMgr.java

diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 5b88c8d..79d499d 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -19,7 +19,6 @@
 import android.app.AlertDialog;
 import android.app.KeyguardManager;
 import android.app.ProgressDialog;
-import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -37,6 +36,7 @@
 import android.widget.Toast;
 
 import com.android.contacts.R;
+import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
 import com.android.internal.telephony.ITelephony;
 import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.TelephonyIntents;
@@ -352,7 +352,7 @@
      *
      * Queries originate from {@link handleAdnEntry}.
      */
-    private static class QueryHandler extends AsyncQueryHandler {
+    private static class QueryHandler extends NoNullCursorAsyncQueryHandler {
 
         private boolean mCanceled;
 
@@ -365,7 +365,7 @@
          * we're handed the ADN cursor.
          */
         @Override
-        protected void onQueryComplete(int token, Object cookie, Cursor c) {
+        protected void onNotNullableQueryComplete(int token, Object cookie, Cursor c) {
             sPreviousAdnQueryHandler = null;
             if (mCanceled) {
                 return;