commit ed92afa6dfae5712c12f63d197b5239c55ce07a6
author Angus Kong <shkong@google.com> Fri Nov 04 15:23:49 2011 +0800
committer Angus Kong <shkong@google.com> Tue Nov 08 11:45:00 2011 +0800
tree b6cbe16b4c4bbde60c7a45ae51d9868be9465422
parent 08ce47f0a87dac202bfe3b97a12d1d059a3c88f6

Fix NPE when returned child is null.

bug: 5563072
Change-Id: I26ffe581b07c2a28da2c249bea2b913e64b3481f

src/com/android/camera/ui/SecondLevelIndicatorControlBar.java

diff --git a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java
index fbf1585..446f8be 100644
--- a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java
+++ b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java
@@ -110,8 +110,8 @@
         if (y >= getHeight()) y = getHeight() - 1;
 
         int index = getTouchViewIndex((int) x, width);
-        if (index == -1) return true;
         View b = getChildAt(index);
+        if (b == null) return true;
         dispatchRelativeTouchEvent(b, event);
         if ((mSelectedIndex != -1) && (index != mSelectedIndex)) {
             View v = getChildAt(mSelectedIndex);