super.onRestoreInstanceState(icicle);
        }

<<<<<<< HEAD
        // If the mToneGenerator creation fails, just continue without it.  It is
        // a local audio signal, and is not as important as the dtmf tone itself.
        synchronized (mToneGeneratorLock) {
            if (mToneGenerator == null) {
                try {
                    mToneGenerator = new ToneGenerator(AudioManager.STREAM_RING,
                            TONE_RELATIVE_VOLUME);
                } catch (RuntimeException e) {
                    Log.w(TAG, "Exception caught while creating local tone generator: " + e);
                    mToneGenerator = null;
                }
            }
        }
    }

    @Override
    protected void onDestroy() {
        super.onDestroy();
        synchronized(mToneGeneratorLock) {
            if (mToneGenerator != null) {
                mToneStopper.removeMessages(STOP_TONE);
                mToneGenerator.release();
                mToneGenerator = null;
            }
        }
=======
        // TODO: We might eventually need to make mVibrateOn come from a
        // user preference rather than a per-platform resource, in which
        // case we would need to update it in onResume() rather than here.
        initVibrationPattern(r);
>>>>>>> 6781a1369906fe7302b6c50b5a9cb572a9653b97
    }

    @Override

            super.onRestoreInstanceState(icicle);
        }

        // TODO: We might eventually need to make mVibrateOn come from a
        // user preference rather than a per-platform resource, in which
        // case we would need to update it in onResume() rather than here.
        initVibrationPattern(r);
    }

    @Override