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

am ed5fede3: Merge change 22667 into eclair

Browse Source 
Merge commit 'ed5fede3f8a376ebed46beeb41796838847ad68d' into eclair-plus-aosp

* commit 'ed5fede3f8a376ebed46beeb41796838847ad68d':
  Fix rare NPE due to key being delivered after activity is stopped. #2062930
This commit is contained in:
Amith Yamasani
2009-08-26 18:01:46 -07:00
committed by Android Git Automerger
parent 1775d3b415 ed5fede3f8
commit c66f5ebf42
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,8 @@ public class VolumePreference extends SeekBarPreference implements
} }
public boolean onKey(View v, int keyCode, KeyEvent event) { 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); boolean isdown = (event.getAction() == KeyEvent.ACTION_DOWN);
switch (keyCode) { switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_DOWN: case KeyEvent.KEYCODE_VOLUME_DOWN: