am ed5fede3: Merge change 22667 into eclair

Merge commit 'ed5fede3f8a376ebed46beeb41796838847ad68d' into eclair-plus-aosp

* commit 'ed5fede3f8a376ebed46beeb41796838847ad68d':
  Fix rare NPE due to key being delivered after activity is stopped. #2062930

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: