diff options
| author | Viktor Yakovel <viktor.yakovel@sonymobile.com> | 2016-06-10 19:00:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 19:00:23 +0000 |
| commit | d055536b0fb62b2a333a8151606e85302ddcd747 (patch) | |
| tree | 646fdf87ba9be07d9e04c0e8e2bfbadb5d717446 | |
| parent | 57a11e6151fa9e317c2cccbed337df27c386c76e (diff) | |
| parent | 6c4f9434ccef659caa2c2726e652dcf34c36eb40 (diff) | |
| download | android_packages_screensavers_PhotoTable-d055536b0fb62b2a333a8151606e85302ddcd747.tar.gz android_packages_screensavers_PhotoTable-d055536b0fb62b2a333a8151606e85302ddcd747.tar.bz2 android_packages_screensavers_PhotoTable-d055536b0fb62b2a333a8151606e85302ddcd747.zip | |
Merge \\"Fixed NullPointerException during Cursor reuse\\" am: 6fc8240932
am: 6c4f9434cc
Change-Id: Id751e96c7d29c3b9e87cde27b7ac2fb936d0194e
| -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; |