From bd8ce5653fc7ec8f3941aa06dd40433b153e2410 Mon Sep 17 00:00:00 2001
From: Kedi Xu <kedix@codeaurora.org>
Date: Fri, 23 Sep 2016 16:28:39 +0800
Subject: SnapdragonGallery: Fix get FilterShowActivity null in MainPanel

In MainPanel fragment, getActivity return null in some situation.

Change-Id: Ide3a2c747d25c8c6b63b967d9a594d6a0ce85d12
CRs-Fixed: 1069910
---
 src/com/android/gallery3d/filtershow/category/MainPanel.java | 3 +++
 1 file changed, 3 insertions(+)
 mode change 100644 => 100755 src/com/android/gallery3d/filtershow/category/MainPanel.java

(limited to 'src')

diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java
old mode 100644
new mode 100755
index 4c909789d..24912bb24
--- a/src/com/android/gallery3d/filtershow/category/MainPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java
@@ -513,6 +513,9 @@ public class MainPanel extends Fragment implements BottomPanel.BottomPanelDelega
 
     public void showPanel(int currentPanel) {
         FilterShowActivity activity = (FilterShowActivity) getActivity();
+        if (null == activity) {
+            return;
+        }
         switch (currentPanel) {
             case LOOKS: {
                 loadCategoryLookPanel(false);
-- 
cgit v1.2.3