diff options
author | Selim Cinek <cinek@google.com> | 2014-02-27 18:19:56 +0100 |
---|---|---|
committer | Selim Cinek <cinek@google.com> | 2014-02-27 18:24:16 +0100 |
commit | a620dc23edf9ea02c62e6c995896d956d4e62c4e (patch) | |
tree | 76893378e18da54f8306b28e4c29e90c29f81154 | |
parent | f99d8bf56c0d6bcfc510193ed9a9c5271e4e4b93 (diff) | |
download | android_packages_wallpapers_LivePicker-a620dc23edf9ea02c62e6c995896d956d4e62c4e.tar.gz android_packages_wallpapers_LivePicker-a620dc23edf9ea02c62e6c995896d956d4e62c4e.tar.bz2 android_packages_wallpapers_LivePicker-a620dc23edf9ea02c62e6c995896d956d4e62c4e.zip |
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
-rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperChange.java | 10 |
1 files changed, 9 insertions, 1 deletions
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(); + } } |