summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-12-12 09:04:45 -0800
committerGlenn Kasten <gkasten@google.com>2011-12-14 13:14:22 -0800
commit62de3db2d6adb4e7cc5dc8a37d17ad456973a1d9 (patch)
tree25d0228bc044fa10bad9d96fb463dfb68a42ba26
parente61fd281a8cb69ae45c5de4b160ab86226083152 (diff)
downloadframeworks_base-62de3db2d6adb4e7cc5dc8a37d17ad456973a1d9.zip
frameworks_base-62de3db2d6adb4e7cc5dc8a37d17ad456973a1d9.tar.gz
frameworks_base-62de3db2d6adb4e7cc5dc8a37d17ad456973a1d9.tar.bz2
Use const char correctly in AudioFlinger
Use const char [] instead of const char * to eliminate unnecessary pointer. Make the array audio_interfaces also const, in addition to the strings. Change-Id: I31f33d1dcb9a657ee136f4280fd2d46492496831
-rw-r--r--services/audioflinger/AudioFlinger.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index b48f23d..6bf402a 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -63,8 +63,8 @@
namespace android {
-static const char* kDeadlockedString = "AudioFlinger may be deadlocked\n";
-static const char* kHardwareLockedString = "Hardware lock is taken\n";
+static const char kDeadlockedString[] = "AudioFlinger may be deadlocked\n";
+static const char kHardwareLockedString[] = "Hardware lock is taken\n";
//static const nsecs_t kStandbyTimeInNsecs = seconds(3);
static const float MAX_GAIN = 4096.0f;
@@ -147,7 +147,7 @@ out:
return rc;
}
-static const char *audio_interfaces[] = {
+static const char * const audio_interfaces[] = {
"primary",
"a2dp",
"usb",