Merge "Safe check so we don't move cursor beyond possible pos scope." into nyc-dev

2016-04-27 20:33:51 +00:00
parent 0c6e213dc7 71c7565093
commit 2360aa33db
1 changed files with 4 additions and 1 deletions
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
@@ -149,7 +149,10 @@ public class Model {

        mCursor.moveToPosition(-1);
        for (int pos = 0; pos < mCursorCount; ++pos) {
-            mCursor.moveToNext();
+            if (!mCursor.moveToNext()) {
+                Log.e(TAG, "Fail to move cursor to next pos: " + pos);
+                return;
+            }
            positions[pos] = pos;

            // Generates a Model ID for a cursor entry that refers to a document. The Model ID is a