Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 942feaa2 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

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

Merge commit '6ff80dcf' into eclair-plus-aosp

* commit '6ff80dcf':
  Fix #2377870 : NPE in Dock settings
parents 39c3d10b 6ff80dcf

src/com/android/settings/DockSettings.java

+6 −1
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ public class DockSettings extends PreferenceActivity { 


    private void initDockSettings() {

        mAudioSettings = findPreference(KEY_AUDIO_SETTINGS);

        if (mAudioSettings != null) {

            mAudioSettings.setSummary(R.string.dock_audio_summary_none);

        }

    }



    private void handleDockChange(Intent intent) {
@@ -104,7 +107,9 @@ public class DockSettings extends PreferenceActivity { 
    @Override

    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {

        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) {

                showDialog(DIALOG_NOT_DOCKED);

            } else {