diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-09-05 21:11:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 21:11:03 +0000 |
| commit | 34651e3203be1ffd99646541d5c1ad051dc7d3c4 (patch) | |
| tree | 82406575643660604f38c6dd22b3146f916b28f8 /src | |
| parent | 26acafbe67565a9cc6aeb7d6c43a1c6d1cb9b73c (diff) | |
| parent | 1bd90b0ed3344102faf1ffb5706f956ef6877f38 (diff) | |
| download | android_packages_apps_Trebuchet-34651e3203be1ffd99646541d5c1ad051dc7d3c4.tar.gz android_packages_apps_Trebuchet-34651e3203be1ffd99646541d5c1ad051dc7d3c4.tar.bz2 android_packages_apps_Trebuchet-34651e3203be1ffd99646541d5c1ad051dc7d3c4.zip | |
Merge "Catch exceptions when setting wallpaper offsets" into jb-ub-gel-agar
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 12 |
1 files 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); + } } } } |