PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 942feaa2: am 6ff80dcf: Fix #2377870 : NPE in Dock settings

Browse Source 
Merge commit '942feaa2eff1153564b98a01f644083c1b58cf2d'

* commit '942feaa2eff1153564b98a01f644083c1b58cf2d':
  Fix #2377870 : NPE in Dock settings
This commit is contained in:
Amith Yamasani
2010-01-21 17:54:53 -08:00
committed by Android Git Automerger
parent 2197f83b6b 942feaa2ef
commit d4237f884a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/DockSettings.java
View File

@@ -72,6 +72,9 @@ public class DockSettings extends PreferenceActivity {
private void initDockSettings() { private void initDockSettings() {
mAudioSettings = findPreference(KEY_AUDIO_SETTINGS); mAudioSettings = findPreference(KEY_AUDIO_SETTINGS);
if (mAudioSettings != null) {
mAudioSettings.setSummary(R.string.dock_audio_summary_none);
}
} }
private void handleDockChange(Intent intent) { private void handleDockChange(Intent intent) {
@@ -104,7 +107,9 @@ public class DockSettings extends PreferenceActivity {
@Override @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
if (preference == mAudioSettings) { if (preference == mAudioSettings) {
int dockState = mDockIntent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0); int dockState = mDockIntent != null
? mDockIntent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0)
: Intent.EXTRA_DOCK_STATE_UNDOCKED;
if (dockState == Intent.EXTRA_DOCK_STATE_UNDOCKED) { if (dockState == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
showDialog(DIALOG_NOT_DOCKED); showDialog(DIALOG_NOT_DOCKED);
} else { } else {