summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorKedi Xu <kedix@codeaurora.org>2016-09-23 16:28:39 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-23 01:31:32 -0700
commitbd8ce5653fc7ec8f3941aa06dd40433b153e2410 (patch)
tree7aa5d7990482eeeb5b8c5be7915c3c954a40a0e0 /src/com/android
parentc7be107928a283acf4acbbefba27b9b78b6486b0 (diff)
downloadandroid_packages_apps_Gallery2-bd8ce5653fc7ec8f3941aa06dd40433b153e2410.tar.gz
android_packages_apps_Gallery2-bd8ce5653fc7ec8f3941aa06dd40433b153e2410.tar.bz2
android_packages_apps_Gallery2-bd8ce5653fc7ec8f3941aa06dd40433b153e2410.zip
SnapdragonGallery: Fix get FilterShowActivity null in MainPanel
In MainPanel fragment, getActivity return null in some situation. Change-Id: Ide3a2c747d25c8c6b63b967d9a594d6a0ce85d12 CRs-Fixed: 1069910
Diffstat (limited to 'src/com/android')
-rwxr-xr-x[-rw-r--r--]src/com/android/gallery3d/filtershow/category/MainPanel.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java
index 4c909789d..24912bb24 100644..100755
--- 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);