summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-09-05 23:10:14 +0200
committerMichael Jurka <mikejurka@google.com>2013-09-05 23:10:14 +0200
commit1bd90b0ed3344102faf1ffb5706f956ef6877f38 (patch)
tree950838001e83a0284061503135190b80ceffb189 /src
parentc58497ee619416c4949b16eb43486c11618b69e5 (diff)
downloadandroid_packages_apps_Trebuchet-1bd90b0ed3344102faf1ffb5706f956ef6877f38.tar.gz
android_packages_apps_Trebuchet-1bd90b0ed3344102faf1ffb5706f956ef6877f38.tar.bz2
android_packages_apps_Trebuchet-1bd90b0ed3344102faf1ffb5706f956ef6877f38.zip
Catch exceptions when setting wallpaper offsets
Bug: 10514504
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Workspace.java12
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);
+ }
}
}
}