diff options
| author | Viktor Yakovel <viktor.yakovel@sonymobile.com> | 2016-06-10 19:03:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 19:03:51 +0000 |
| commit | fc1ea1acac862506648e09c35b8ebb4928b7dab8 (patch) | |
| tree | 646fdf87ba9be07d9e04c0e8e2bfbadb5d717446 | |
| parent | 40cbebcf40983737b2f2f7bf7d80a52a1a0ad09d (diff) | |
| parent | d055536b0fb62b2a333a8151606e85302ddcd747 (diff) | |
| download | android_packages_screensavers_PhotoTable-fc1ea1acac862506648e09c35b8ebb4928b7dab8.tar.gz android_packages_screensavers_PhotoTable-fc1ea1acac862506648e09c35b8ebb4928b7dab8.tar.bz2 android_packages_screensavers_PhotoTable-fc1ea1acac862506648e09c35b8ebb4928b7dab8.zip | |
Merge \\\"Fixed NullPointerException during Cursor reuse\\\" am: 6fc8240932 am: 6c4f9434cc
am: d055536b0f
Change-Id: I2c448980b002e0aa044a2303ee138a3594b126f4
| -rw-r--r-- | src/com/android/dreams/phototable/CursorPhotoSource.java | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ public abstract class CursorPhotoSource extends PhotoSource { 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 @@ public abstract class CursorPhotoSource extends PhotoSource { if (!current.cursor.isBeforeFirst()) { data = unpackImageData(current.cursor, null); data.cursor = current.cursor; + data.uri = current.uri; data.position = current.cursor.getPosition(); } return data; |