commit f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d
author Alan Newberger <alann@google.com> Wed Oct 22 18:53:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 22 18:53:21 2014 +0000
tree a2eb1f8e40fa2a6dab2735f6d4c061257b546a42
parent f4084e35eac8a8b86e807573647d4a7b43852a59
parent 61c5f9f86b5fd8937fac3d082398086bac0d8db6

Merge "Null check for buildItemFromData" into ub-camera-glacier

src/com/android/camera/settings/CameraSettingsActivity.java

diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
index db9c62c..82b54cd 100644
--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -254,6 +254,14 @@
          * was found and removed.
          */
         private boolean recursiveDelete(PreferenceGroup group, Preference preference) {
+            if (group == null) {
+                Log.d(TAG, "attempting to delete from null preference group");
+                return false;
+            }
+            if (preference == null) {
+                Log.d(TAG, "attempting to delete null preference");
+                return false;
+            }
             if (group.removePreference(preference)) {
                 // Removal was successful.
                 return true;