From 71c7565093fcdc5c58dd16a606f528fff3002177 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Fri, 22 Apr 2016 16:12:50 -0700 Subject: [PATCH] Safe check so we don't move cursor beyond possible pos scope. Bug: 28278372 Change-Id: I7c66b5229ae3a6a1b99bdf0f02bf1f0b8a1c79b2 --- .../src/com/android/documentsui/dirlist/Model.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java index e2a28ad9a782a..ab45a9f39e5a5 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java @@ -163,7 +163,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