diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-02-26 13:00:47 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-26 13:00:47 -0800 |
| commit | 09d74ee21ee847e149e704cb4076612f115d7401 (patch) | |
| tree | 44e4af3bcee325f7cccb4cfa65c2dc0065eb3c5b /src | |
| parent | c99cffbffcf38f0e6bf10c9ff541b1bb5180316e (diff) | |
| parent | 88ea1164afb52327b4ae2d5c695700b12fff1134 (diff) | |
| download | packages_apps_settings-09d74ee21ee847e149e704cb4076612f115d7401.zip packages_apps_settings-09d74ee21ee847e149e704cb4076612f115d7401.tar.gz packages_apps_settings-09d74ee21ee847e149e704cb4076612f115d7401.tar.bz2 | |
Merge "Fix a couple of monkey bugs."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/RingerVolumePreference.java | 8 |
1 files changed, 5 insertions, 3 deletions
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); } |