diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-11-14 14:33:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-14 14:33:06 -0800 |
| commit | 6066a2b4de36549b7d8fe36507b7254e501f0b28 (patch) | |
| tree | 2bdf211e88c3b06eeed4d4fc5764313a9a6a7a9f | |
| parent | 258576a82c2293c3a988bf2dc6744fd8082421f9 (diff) | |
| parent | 8e2e5722242c2b5cc02d433105c668f47ab84785 (diff) | |
| download | frameworks_base-6066a2b4de36549b7d8fe36507b7254e501f0b28.zip frameworks_base-6066a2b4de36549b7d8fe36507b7254e501f0b28.tar.gz frameworks_base-6066a2b4de36549b7d8fe36507b7254e501f0b28.tar.bz2 | |
Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1
| -rw-r--r-- | core/java/android/app/WallpaperManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 91398bc..b1c1f30 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -635,6 +635,9 @@ public class WallpaperManager { //Log.v(TAG, "...app returning after sending offsets!"); } catch (RemoteException e) { // Ignore. + } catch (IllegalArgumentException e) { + // Since this is being posted, it's possible that this windowToken is no longer + // valid, for example, if setWallpaperOffsets is called just before rotation. } } }); |