Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev

packages/DocumentsUI/src/com/android/documentsui/RecentsLoader.java

@@ -157,6 +157,9 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> {
                     throw new RuntimeException(e);
                 } catch (ExecutionException e) {
                     // We already logged on other side
+                } catch (Exception e) {
+                    Log.e(TAG, "Failed to query Recents for authority: " + task.authority
+                        + ". Skip this authority in Recents.", e);
                 }
             } else {
                 allDone = false;

packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java

@@ -107,7 +107,13 @@ public class Model {
         mSortOrder = result.sortOrder;
         doc = result.doc;
 
+        try {
             updateModelData();
+        } catch (Exception e) {
+            Log.e(TAG, "Error while accessing cursors", e);
+            notifyUpdateListeners(e);
+            return;
+        }
 
         final Bundle extras = mCursor.getExtras();
         if (extras != null) {