From 88ea1164afb52327b4ae2d5c695700b12fff1134 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Fri, 26 Feb 2010 12:58:26 -0800
Subject: Fix a couple of monkey bugs.

Bug: 2467286
Bug: 2436861
---
 src/com/android/settings/RingerVolumePreference.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 7d8c30a..3ecd819 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -123,13 +123,15 @@ public class RingerVolumePreference extends VolumePreference implements
     protected void onSampleStarting(SeekBarVolumizer volumizer) {
         super.onSampleStarting(volumizer);
         for (SeekBarVolumizer vol : mSeekBarVolumizer) {
-            if (vol != volumizer) vol.stopSample();
+            if (vol != null && vol != volumizer) vol.stopSample();
         }
     }
 
     private void setNotificationVolumeVisibility(boolean visible) {
-        mSeekBarVolumizer[0].getSeekBar().setVisibility(
-                visible ? View.VISIBLE : View.GONE);
+        if (mSeekBarVolumizer[0] != null) {
+            mSeekBarVolumizer[0].getSeekBar().setVisibility(
+                    visible ? View.VISIBLE : View.GONE);
+        }
         mNotificationVolumeTitle.setVisibility(visible ? View.VISIBLE : View.GONE);
     }
 
-- 
cgit v1.1