summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-11-08 08:20:30 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-11-08 08:20:30 +0000
commite31baf18a29d1a40235fd27066822dda6f6b0e62 (patch)
tree46b0c1e4f9a68b25c0abbc8afe3c4936010fc779
parent09685340fdce50ddce36dc758170605f0dae31d9 (diff)
parentb939c997a77661f6637e470803390d653b05dd9e (diff)
downloadandroid_packages_wallpapers_LivePicker-e31baf18a29d1a40235fd27066822dda6f6b0e62.tar.gz
android_packages_wallpapers_LivePicker-e31baf18a29d1a40235fd27066822dda6f6b0e62.tar.bz2
android_packages_wallpapers_LivePicker-e31baf18a29d1a40235fd27066822dda6f6b0e62.zip
Snap for 4439972 from b939c997a77661f6637e470803390d653b05dd9e to pi-release
Change-Id: I96539eeb329abc54ffbe10cce428320157366834
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
index 9dd29c4..cc4ffd6 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java
@@ -42,7 +42,10 @@ public class LiveWallpaperActivity extends ListActivity {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_PREVIEW) {
- if (resultCode == RESULT_OK) finish();
+ if (resultCode == RESULT_OK) {
+ setResult(resultCode);
+ finish();
+ }
}
}