commit 74e8f30b3a67af4defd8f73c503e794785671fee
author Makoto Onuki <omakoto@google.com> Fri Feb 03 13:49:09 2012 -0800
committer Makoto Onuki <omakoto@google.com> Fri Feb 03 13:49:09 2012 -0800
tree 0bddc5a84474bccdd35f102f8a242690672dfaea
parent 7898a8e97722d5bf0db3c04107b2957b998c0332

Add debug logs to applyBatch

Change-Id: I646c7e091c2e778516e6287e3e91770e556ad71f

src/com/android/providers/contacts/AbstractContactsProvider.java

diff --git a/src/com/android/providers/contacts/AbstractContactsProvider.java b/src/com/android/providers/contacts/AbstractContactsProvider.java
index 0d90f18..a33320f 100644
--- a/src/com/android/providers/contacts/AbstractContactsProvider.java
+++ b/src/com/android/providers/contacts/AbstractContactsProvider.java
@@ -25,6 +25,7 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteTransactionListener;
 import android.net.Uri;
+import android.util.Log;
 
 import java.util.ArrayList;
 
@@ -37,6 +38,10 @@
 public abstract class AbstractContactsProvider extends ContentProvider
         implements SQLiteTransactionListener {
 
+    protected static final String TAG = "ContactsProvider";
+
+    protected static final boolean VERBOSE_LOGGING = Log.isLoggable(TAG, Log.VERBOSE);
+
     /**
      * Duration in ms to sleep after successfully yielding the lock during a batch operation.
      */
@@ -174,6 +179,9 @@
     @Override
     public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations)
             throws OperationApplicationException {
+        if (VERBOSE_LOGGING) {
+            Log.v(TAG, "applyBatch: " + operations.size() + " ops");
+        }
         int ypCount = 0;
         int opCount = 0;
         ContactsTransaction transaction = startTransaction(true);
@@ -189,6 +197,9 @@
                 }
                 final ContentProviderOperation operation = operations.get(i);
                 if (i > 0 && operation.isYieldAllowed()) {
+                    if (VERBOSE_LOGGING) {
+                        Log.v(TAG, "applyBatch: " + opCount + " ops finished; about to yield...");
+                    }
                     opCount = 0;
                     try {
                         if (yield(transaction)) {

src/com/android/providers/contacts/ContactsProvider2.java

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 3974ff3..9710bb1 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -174,10 +174,6 @@
 public class ContactsProvider2 extends AbstractContactsProvider
         implements OnAccountsUpdateListener {
 
-    private static final String TAG = "ContactsProvider";
-
-    private static final boolean VERBOSE_LOGGING = Log.isLoggable(TAG, Log.VERBOSE);
-
     private static final int BACKGROUND_TASK_INITIALIZE = 0;
     private static final int BACKGROUND_TASK_OPEN_WRITE_ACCESS = 1;
     private static final int BACKGROUND_TASK_UPDATE_ACCOUNTS = 3;