Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev

Browse Source
This commit is contained in:
John Spurlock
2014-10-21 18:39:18 +00:00
committed by Android (Google) Code Review
parent 7c133e19dd 735f9ebc18
commit cc8b3e8d4e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/preference/SeekBarVolumizer.java
View File

@@ -130,6 +130,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba
} }
private void postStartSample() { private void postStartSample() {
if (mHandler == null) return;
mHandler.removeMessages(MSG_START_SAMPLE); mHandler.removeMessages(MSG_START_SAMPLE);
mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_START_SAMPLE), mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_START_SAMPLE),
isSamplePlaying() ? CHECK_RINGTONE_PLAYBACK_DELAY_MS : 0); isSamplePlaying() ? CHECK_RINGTONE_PLAYBACK_DELAY_MS : 0);
@@ -150,7 +151,8 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba
} }
} }
void postStopSample() { private void postStopSample() {
if (mHandler == null) return;
// remove pending delayed start messages // remove pending delayed start messages
mHandler.removeMessages(MSG_START_SAMPLE); mHandler.removeMessages(MSG_START_SAMPLE);
mHandler.removeMessages(MSG_STOP_SAMPLE); mHandler.removeMessages(MSG_STOP_SAMPLE);
@@ -200,7 +202,8 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba
postSetVolume(progress); postSetVolume(progress);
} }
void postSetVolume(int progress) { private void postSetVolume(int progress) {
if (mHandler == null) return;
// Do the volume changing separately to give responsive UI // Do the volume changing separately to give responsive UI
mLastProgress = progress; mLastProgress = progress;
mHandler.removeMessages(MSG_SET_STREAM_VOLUME); mHandler.removeMessages(MSG_SET_STREAM_VOLUME);

2
core/java/android/preference/VolumePreference.java
View File

@@ -117,7 +117,7 @@ public class VolumePreference extends SeekBarDialogPreference implements
public void onActivityStop() { public void onActivityStop() {
if (mSeekBarVolumizer != null) { if (mSeekBarVolumizer != null) {
mSeekBarVolumizer.postStopSample(); mSeekBarVolumizer.stopSample();
} }
} }