diff options
| author | Viktor Yakovel <viktor.yakovel@sonymobile.com> | 2016-06-10 18:56:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 18:56:57 +0000 |
| commit | 6c4f9434ccef659caa2c2726e652dcf34c36eb40 (patch) | |
| tree | 828620d9aedb84ab5e252f97d27521660df21c6d | |
| parent | 3e11178327751ae0cc2d034992fbab6e53656713 (diff) | |
| parent | 6fc82409324df18079ea5ff864c5d122a7eede82 (diff) | |
| download | android_packages_screensavers_PhotoTable-6c4f9434ccef659caa2c2726e652dcf34c36eb40.tar.gz android_packages_screensavers_PhotoTable-6c4f9434ccef659caa2c2726e652dcf34c36eb40.tar.bz2 android_packages_screensavers_PhotoTable-6c4f9434ccef659caa2c2726e652dcf34c36eb40.zip | |
Merge \"Fixed NullPointerException during Cursor reuse\"
am: 6fc8240932
Change-Id: I6534a8ac33d7fcc3454bab4be2a25a7dfe79e866
| -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; |