From 1bd90b0ed3344102faf1ffb5706f956ef6877f38 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 5 Sep 2013 23:10:14 +0200
Subject: Catch exceptions when setting wallpaper offsets

Bug: 10514504
---
 src/com/android/launcher3/Workspace.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9007b58b7..d29fb35ed 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1013,10 +1013,14 @@ public class Workspace extends SmoothPagedView
         private void updateOffset(boolean force) {
             if (mWaitingForUpdate || force) {
                 mWaitingForUpdate = false;
-                if (computeScrollOffset()) {
-                    mWallpaperManager.setWallpaperOffsets(mWindowToken,
-                            mWallpaperOffset.getCurrX(), 0.5f);
-                    setWallpaperOffsetSteps();
+                if (computeScrollOffset() && mWindowToken != null) {
+                    try {
+                        mWallpaperManager.setWallpaperOffsets(mWindowToken,
+                                mWallpaperOffset.getCurrX(), 0.5f);
+                        setWallpaperOffsetSteps();
+                    } catch (IllegalArgumentException e) {
+                        Log.e(TAG, "Error updating wallpaper offset: " + e);
+                    }
                 }
             }
         }
-- 
cgit v1.2.3