Projects >> android_packages_apps_SoundRecorder >>c8fd8641691215daf7e8317b03f442f64fd9cc84

Chunk
Conflicting content
     * the MediaPlaybackService to pause playback.
     */
    private void stopAudioPlayback() {
<<<<<<< HEAD
        AudioManager am = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
        am.requestAudioFocus(null, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
=======
        // Shamelessly copied from MediaPlaybackService.java, which
        // should be public, but isn't.
        Intent i = new Intent("com.android.music.musicservicecommand");
        i.putExtra("command", "pause");
        mAudioManager.requestAudioFocus(mAudioFocusListener, AudioManager.STREAM_MUSIC,
                    AudioManager.AUDIOFOCUS_GAIN);
        sendBroadcast(i);
        try{
           Thread.sleep(STOP_WAIT);
        } catch (InterruptedException ex) {
        }
>>>>>>> 1ee17ba19e8cc4bdce9149ed954974e39deedb89
    }

    private OnAudioFocusChangeListener mAudioFocusListener = new OnAudioFocusChangeListener() {
Solution content
     * the MediaPlaybackService to pause playback.
     */
    private void stopAudioPlayback() {
        // Shamelessly copied from MediaPlaybackService.java, which
        // should be public, but isn't.
        Intent i = new Intent("com.android.music.musicservicecommand");
        i.putExtra("command", "pause");
        mAudioManager.requestAudioFocus(mAudioFocusListener, AudioManager.STREAM_MUSIC,
                    AudioManager.AUDIOFOCUS_GAIN);
        sendBroadcast(i);
        try{
           Thread.sleep(STOP_WAIT);
        } catch (InterruptedException ex) {
        }
    }

    private OnAudioFocusChangeListener mAudioFocusListener = new OnAudioFocusChangeListener() {
File
SoundRecorder.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Comment
Method invocation
Try statement
Variable