From 6ff5906981fac2aa67c8c1f0df151b536e80ccaf Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 25 Aug 2009 15:40:14 -0700
Subject: [PATCH] Fix rare NPE due to key being delivered after activity is
 stopped. #2062930

---
 core/java/android/preference/VolumePreference.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/android/preference/VolumePreference.java b/core/java/android/preference/VolumePreference.java
index 46cce52d4b48b..b337d2803cfd1 100644
--- 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: