commit 55a2bc8a65342e28c96670e10f39c30102d6ec4a
author zhuw <zhuw@codeaurora.org> Wed Sep 05 17:24:22 2018 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 05 02:27:13 2018 -0700
tree 405b446022b465fba5c8bae9052bfd0e28af785d
parent e3e73ab80b01e0c4ea11412e032626a363da97d9

fix null pointer in settingsActivity

filter 2 values: mApnCategory and mApn

Change-Id: Ieefb776f15f9830be0a449387b54a08783ec459c

src/org/codeaurora/gallery3d/video/SettingsActivity.java

diff --git a/src/org/codeaurora/gallery3d/video/SettingsActivity.java b/src/org/codeaurora/gallery3d/video/SettingsActivity.java
old mode 100644
new mode 100755
index 6372d49..bf7b7d7
--- a/src/org/codeaurora/gallery3d/video/SettingsActivity.java
+++ b/src/org/codeaurora/gallery3d/video/SettingsActivity.java
@@ -125,7 +125,7 @@
 
         initializeSubscriptions();
 
-        if (!hasActiveSubscriptions()) {
+        if (!hasActiveSubscriptions() && mApnCategory != null && mApn != null) {
             ((PreferenceGroup)mApnCategory).removePreference(mApn);
             getPreferenceScreen().removePreference(mApnCategory);