Merge "Workaround for preserving responsiveness on a slow InputConnection." into jb-ub-latinimegoogle
diff --git a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
index 6e146ae..9022151 100644
--- a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
+++ b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
@@ -81,7 +81,8 @@
             // Remove all the previously scheduled downloads. This will also makes sure
             // that any erroneously stuck downloads will get cleared. (b/21797386)
             removeOldDownloads(context);
-            downloadLatestDictionaries(context);
+            // b/21797386
+            // downloadLatestDictionaries(context);
         } else if (Intent.ACTION_BOOT_COMPLETED.equals(intentAction)) {
             Log.i(TAG, "Boot has been completed");
             toggleAppIcon(context);
@@ -122,13 +123,11 @@
                     | DownloadManager.STATUS_RUNNING);
             final Cursor c = downloadManagerWrapper.query(q);
             if (c != null) {
-                if (c.moveToFirst()) {
-                    while (c.moveToNext()) {
-                        final long downloadId = c
-                                .getLong(c.getColumnIndex(DownloadManager.COLUMN_ID));
-                        downloadManagerWrapper.remove(downloadId);
-                        Log.i(TAG, "Removed the download with Id: " + downloadId);
-                    }
+                for (c.moveToFirst(); !c.isAfterLast(); c.moveToNext()) {
+                    final long downloadId = c
+                            .getLong(c.getColumnIndex(DownloadManager.COLUMN_ID));
+                    downloadManagerWrapper.remove(downloadId);
+                    Log.i(TAG, "Removed the download with Id: " + downloadId);
                 }
                 c.close();
             }