commit e3b55f9356ac9ebb91a53f62f5dd0ea72fc25d74
author Michael W <baddaemon87@gmail.com> Wed Jul 12 14:16:42 2017 +0200
committer LuK1337 <priv.luk@gmail.com> Thu Nov 26 11:21:26 2020 +0100
tree 206f5ca63ed842201453174486a48e2bc8f8cf4f
parent 02b01d285fc582d74926f8cfd1ceb42944ad7e79

Gallery2: Fix potential crash

Author: Michael W <baddaemon87@gmail.com>
Date:   Wed Jul 12 14:16:42 2017 +0200

    Gallery2: Fix potential crash

    * A race between deleting and displaying videos seems to report a higher
      count of videos available than actually accessible.

    BUGBASH-489

    Change-Id: Iac24002feb8701cc4182c3834f663be017b625d5

Author: KhabarlakKonstantin <habarlack@gmail.com>
Date:   Tue Oct 3 11:22:40 2017 +0300

    Fix crash after deleting a video on Albums tab

    getMediaItem can return empty list if no more media items available,
    break folder processing then
    Number of items returned by getMediaItem can be inconsistent with
    getMediaItemCount

    Change-Id: I7f2abce5d3832a1b2c1fe068b629a3474ed742e2

Change-Id: Ibcaeff698da118f484a6f38528b4a2111a009fdd

src/com/android/gallery3d/app/AlbumPage.java

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 7f947d8..c3ef4c3 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -652,9 +652,17 @@
         if (mMediaSet == null)
             return false;
         int count = mMediaSet.getMediaItemCount();
+        ArrayList<MediaItem> list;
         MediaItem item;
         for (int i = 0; i < count; i++) {
-            item = mMediaSet.getMediaItem(i, 1).get(0);
+            list = mMediaSet.getMediaItem(i, 1);
+            if (list == null) {
+                continue;
+            }
+            if (list.isEmpty()) {
+                break;
+            }
+            item = list.get(0);
             if (item == null) {
                 continue;
             }