commit d055536b0fb62b2a333a8151606e85302ddcd747
author Viktor Yakovel <viktor.yakovel@sonymobile.com> Fri Jun 10 19:00:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 10 19:00:23 2016 +0000
tree 646fdf87ba9be07d9e04c0e8e2bfbadb5d717446
parent 57a11e6151fa9e317c2cccbed337df27c386c76e
parent 6c4f9434ccef659caa2c2726e652dcf34c36eb40

Merge \\"Fixed NullPointerException during Cursor reuse\\" am: 6fc8240932
am: 6c4f9434cc

Change-Id: Id751e96c7d29c3b9e87cde27b7ac2fb936d0194e

src/com/android/dreams/phototable/CursorPhotoSource.java

diff --git a/src/com/android/dreams/phototable/CursorPhotoSource.java b/src/com/android/dreams/phototable/CursorPhotoSource.java
index f010a92..6af0807 100644
--- a/src/com/android/dreams/phototable/CursorPhotoSource.java
+++ b/src/com/android/dreams/phototable/CursorPhotoSource.java
@@ -49,6 +49,7 @@
         if (!current.cursor.isAfterLast()) {
             data = unpackImageData(current.cursor, null);
             data.cursor = current.cursor;
+            data.uri = current.uri;
             data.position = current.cursor.getPosition();
         }
         return data;
@@ -66,6 +67,7 @@
         if (!current.cursor.isBeforeFirst()) {
             data = unpackImageData(current.cursor, null);
             data.cursor = current.cursor;
+            data.uri = current.uri;
             data.position = current.cursor.getPosition();
         }
         return data;