commit d483ca1f81704f7a1c6a310bd2ba289aef2ffb65
author Bobby Georgescu <georgescu@google.com> Fri Jun 07 11:46:56 2013 -0700
committer Bobby Georgescu <georgescu@google.com> Fri Jun 07 11:46:56 2013 -0700
tree 9eebc951649c890f3aaf3dd4c38ea0050aac61c5
parent b7d13430b030f7d46ed3335d84ff20f11b44efff

Fix NPE in PreparePageFadeoutTexture

Bug: 8837688
Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09

src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java

diff --git a/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java b/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
index f52aa5f..ce672f2 100644
--- a/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
+++ b/src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
@@ -17,6 +17,10 @@
     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) {