From a620dc23edf9ea02c62e6c995896d956d4e62c4e Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Thu, 27 Feb 2014 18:19:56 +0100
Subject: Fixed a bug where the caller of the wallpaper changing activity did
 not receive the correct result back, since it was discarded.

Bug: 12063773
Change-Id: I47adcb6522df1d71824c32e7f8fb80296f657aff
---
 src/com/android/wallpaper/livepicker/LiveWallpaperChange.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java b/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java
index dc03174..586bdb0 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperChange.java
@@ -78,7 +78,6 @@ public class LiveWallpaperChange extends Activity {
                     Intent intent = new Intent(WallpaperService.SERVICE_INTERFACE);
                     intent.setClassName(info.getPackageName(), info.getServiceName());
                     LiveWallpaperPreview.showPreview(this, 0, intent, info);
-                    finish();
                     return;
                 }
             }
@@ -87,4 +86,13 @@ public class LiveWallpaperChange extends Activity {
         Log.w(TAG, "Not a live wallpaper: " + comp);
         finish();
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        // forward result code
+        setResult(resultCode);
+        finish();
+    }
 }
-- 
cgit v1.2.3