Merge change 22667 into eclair

* changes: Fix rare NPE due to key being delivered after activity is stopped. #2062930
2009-08-26 17:59:26 -07:00
parent eafcadca7a 6ff5906981
commit ed5fede3f8
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/preference/VolumePreference.java
+++ b/core/java/android/preference/VolumePreference.java
@@ -78,6 +78,8 @@ public class VolumePreference extends SeekBarPreference implements
    }

    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        // If key arrives immediately after the activity has been cleaned up.
+        if (mSeekBarVolumizer == null) return true;
        boolean isdown = (event.getAction() == KeyEvent.ACTION_DOWN);
        switch (keyCode) {
            case KeyEvent.KEYCODE_VOLUME_DOWN: