From d483ca1f81704f7a1c6a310bd2ba289aef2ffb65 Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Fri, 7 Jun 2013 11:46:56 -0700
Subject: Fix NPE in PreparePageFadeoutTexture

Bug: 8837688
Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09
---
 src/com/android/gallery3d/ui/PreparePageFadeoutTexture.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/com')

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) {
-- 
cgit v1.2.3