diff options
| author | Viktor Yakovel <viktor.yakovel@sonymobile.com> | 2016-06-10 19:07:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 19:07:17 +0000 |
| commit | 494c5da0ff436ef9c7ad1ecdc40e54a90dc1667d (patch) | |
| tree | 7c8e651c7c2493fea1c0f927ef6109081c553d19 | |
| parent | 34139287314b8c4c1be7e80ffdd3e8c92d0f1fa6 (diff) | |
| parent | fc1ea1acac862506648e09c35b8ebb4928b7dab8 (diff) | |
| download | android_packages_screensavers_PhotoTable-494c5da0ff436ef9c7ad1ecdc40e54a90dc1667d.tar.gz android_packages_screensavers_PhotoTable-494c5da0ff436ef9c7ad1ecdc40e54a90dc1667d.tar.bz2 android_packages_screensavers_PhotoTable-494c5da0ff436ef9c7ad1ecdc40e54a90dc1667d.zip | |
Merge \\\\"Fixed NullPointerException during Cursor reuse\\\\" am: 6fc8240932 am: 6c4f9434cc am: d055536b0f
am: fc1ea1acac
Change-Id: I7f3159553858f8bc6678664c60b386018756fffb
| -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; |