| Chunk |
|---|
| Conflicting content |
|---|
*/
public static final int MODE_IN_CALL = AudioSystem.MODE_IN_CALL;
/**
<<<<<<< HEAD
=======
* @hide
>>>>>>> 2ba92c71b5684dce700cf848bf157153c156df1d
* In communication audio mode. An audio/video chat or VoIP call is established.
*/
public static final int MODE_IN_COMMUNICATION = AudioSystem.MODE_IN_COMMUNICATION; |
| Solution content |
|---|
*/
public static final int MODE_IN_CALL = AudioSystem.MODE_IN_CALL;
/**
* In communication audio mode. An audio/video chat or VoIP call is established.
*/
public static final int MODE_IN_COMMUNICATION = AudioSystem.MODE_IN_COMMUNICATION; |
| File |
|---|
| AudioManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
* {@link #DEFAULT} otherwise. */
public static final int VOICE_RECOGNITION = 6;
<<<<<<< HEAD
/** Microphone audio source tuned for voice communications such as VoIP. It
* will for instance take advantage of echo cancellation or automatic gain control
* if available. It otherwise behaves like {@link #DEFAULT} if no voice processing
* is applied.
=======
/**
* @hide
* Microphone audio source tuned for voice communications such as VoIP. It
* will for instance take advantage of echo cancellation or automatic gain control
* if available. It otherwise behaves like {@link #DEFAULT} if no voice processing
* is available.
>>>>>>> 2ba92c71b5684dce700cf848bf157153c156df1d
*/
public static final int VOICE_COMMUNICATION = 7;
} |
| Solution content |
|---|
* {@link #DEFAULT} otherwise. */
public static final int VOICE_RECOGNITION = 6;
/** Microphone audio source tuned for voice communications such as VoIP. It
* will for instance take advantage of echo cancellation or automatic gain control
* if available. It otherwise behaves like {@link #DEFAULT} if no voice processing
* is applied.
*/
public static final int VOICE_COMMUNICATION = 7;
} |
| File |
|---|
| MediaRecorder.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |