am 36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad

* commit '36c21ca1365c0c3832742bc0cf75d3409723254b':
  Check both the requestId of current item and total items in filmstrip for bottom controls.

1 files changed, 5 insertions, 7 deletions

diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 3e29dc0d3..e32cccf68 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -1027,14 +1027,12 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             return;
         }
 
-        // We cannot rely on the requestIds to check for data changes,
-        // because an item hands its id to its rightmost neighbor on
-        // deletion. To avoid loading the ImageData, we check if the DataAdapter
-        // has fewer total items. We don't want to miss setting the controls
-        // for a photo while we're still in capture mode, so ignore its fixed
-        // requestId (0).
+        // We cannot rely on the requestIds alone to check for data changes,
+        // because an item hands its id to its rightmost neighbor on deletion.
+        // To avoid loading the ImageData, we also check if the DataAdapter
+        // has fewer total items.
         int total = mDataAdapter.getTotalNumber();
-        if (!force && (requestId == 0 || mLastTotalNumber == total)) {
+        if (!force && requestId == mLastItemId && mLastTotalNumber == total) {
             return;
         }
         mLastTotalNumber = total;