summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2013-06-07 11:46:56 -0700
committerBobby Georgescu <georgescu@google.com>2013-06-07 11:46:56 -0700
commitd483ca1f81704f7a1c6a310bd2ba289aef2ffb65 (patch)
tree9eebc951649c890f3aaf3dd4c38ea0050aac61c5 /src/com/android/gallery3d/ui
parentb7d13430b030f7d46ed3335d84ff20f11b44efff (diff)
downloadandroid_packages_apps_Snap-d483ca1f81704f7a1c6a310bd2ba289aef2ffb65.tar.gz
android_packages_apps_Snap-d483ca1f81704f7a1c6a310bd2ba289aef2ffb65.tar.bz2
android_packages_apps_Snap-d483ca1f81704f7a1c6a310bd2ba289aef2ffb65.zip
Fix NPE in PreparePageFadeoutTexture
Bug: 8837688 Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09
Diffstat (limited to 'src/com/android/gallery3d/ui')
-rw-r--r--src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java b/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
index f52aa5ff2..ce672f211 100644
--- a/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
+++ b/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
@@ -17,6 +17,10 @@ public class PreparePageFadeoutTexture implements OnGLIdleListener {
private GLView mRootPane;
public PreparePageFadeoutTexture(GLView rootPane) {
+ if (rootPane == null) {
+ mCancelled = true;
+ return;
+ }
int w = rootPane.getWidth();
int h = rootPane.getHeight();
if (w == 0 || h == 0) {