Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev

Browse Source
This commit is contained in:
Zach Johnson
2015-08-25 19:16:59 +00:00
committed by Android (Google) Code Review
parent 3f62358b7e fe8b2477d2
commit 5d636c8c50
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/AudioAttributes.java
View File

@@ -671,15 +671,15 @@ public final class AudioAttributes implements Parcelable {
case USAGE_VOICE_COMMUNICATION: case USAGE_VOICE_COMMUNICATION:
return new String("USAGE_VOICE_COMMUNICATION"); return new String("USAGE_VOICE_COMMUNICATION");
case USAGE_VOICE_COMMUNICATION_SIGNALLING: case USAGE_VOICE_COMMUNICATION_SIGNALLING:
return new String("USAGE_VOICE_COMMUNICATION"); return new String("USAGE_VOICE_COMMUNICATION_SIGNALLING");
case USAGE_ALARM: case USAGE_ALARM:
return new String("USAGE_ALARM"); return new String("USAGE_ALARM");
case USAGE_NOTIFICATION: case USAGE_NOTIFICATION:
return new String("USAGE_NOTIFICATION"); return new String("USAGE_NOTIFICATION");
case USAGE_NOTIFICATION_RINGTONE: case USAGE_NOTIFICATION_RINGTONE:
return new String("USAGE_NOTIFICATION"); return new String("USAGE_NOTIFICATION_RINGTONE");
case USAGE_NOTIFICATION_COMMUNICATION_REQUEST: case USAGE_NOTIFICATION_COMMUNICATION_REQUEST:
return new String("USAGE_NOTIFICATION"); return new String("USAGE_NOTIFICATION_COMMUNICATION_REQUEST");
case USAGE_NOTIFICATION_COMMUNICATION_INSTANT: case USAGE_NOTIFICATION_COMMUNICATION_INSTANT:
return new String("USAGE_NOTIFICATION_COMMUNICATION_INSTANT"); return new String("USAGE_NOTIFICATION_COMMUNICATION_INSTANT");
case USAGE_NOTIFICATION_COMMUNICATION_DELAYED: case USAGE_NOTIFICATION_COMMUNICATION_DELAYED: