diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 66a6da7..0ee17e1 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1,4 +1,5 @@ /* + * Portions Copyright (C) 2012 VMware, Inc. All Rights Reserved. * Copyright (C) 2011 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -261,8 +262,8 @@ #define VOICE_CALL_HEADSET_MIC_VOLUME 8 /* use-case specific output volumes */ -#define NORMAL_SPEAKER_VOLUME_TORO 6 -#define NORMAL_SPEAKER_VOLUME_MAGURO 2 +#define NORMAL_SPEAKER_VOLUME_TORO 9 +#define NORMAL_SPEAKER_VOLUME_MAGURO 7 #define NORMAL_HEADSET_VOLUME_TORO -12 #define NORMAL_HEADSET_VOLUME_MAGURO -12 #define NORMAL_HEADPHONE_VOLUME_TORO -6 /* allow louder output for headphones */ @@ -271,7 +272,7 @@ #define NORMAL_EARPIECE_VOLUME_MAGURO -2 #define VOICE_CALL_SPEAKER_VOLUME_TORO 9 -#define VOICE_CALL_SPEAKER_VOLUME_MAGURO 6 +#define VOICE_CALL_SPEAKER_VOLUME_MAGURO 7 #define VOICE_CALL_HEADSET_VOLUME_TORO -6 #define VOICE_CALL_HEADSET_VOLUME_MAGURO 0 #define VOICE_CALL_EARPIECE_VOLUME_TORO 2 @@ -785,7 +786,7 @@ static int is_device_toro(void) property_get(PRODUCT_DEVICE_PROPERTY, property, PRODUCT_DEVICE_TORO); /* return true if the property matches the given value */ - return strcmp(property, PRODUCT_DEVICE_TORO) == 0; + return strncmp(property, PRODUCT_DEVICE_TORO, 4) == 0; } /* The enable flag when 0 makes the assumption that enums are disabled by |