diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-19 06:08:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-19 06:08:53 -0800 |
| commit | ca42b286a162f5cd6a4a916bfe429abe95780730 (patch) | |
| tree | add4bb37ad9021f097da7088b001ab5d4708521a /services/audioflinger/AudioPolicyService.cpp | |
| parent | 5cb73e780ac3ce0556a68e6e0396486ce9b19a6d (diff) | |
| parent | 8dad0e31c2366c501bd1d600261d0af35a6ca786 (diff) | |
| download | frameworks_av-ca42b286a162f5cd6a4a916bfe429abe95780730.zip frameworks_av-ca42b286a162f5cd6a4a916bfe429abe95780730.tar.gz frameworks_av-ca42b286a162f5cd6a4a916bfe429abe95780730.tar.bz2 | |
Merge "Use const const strings for arrays and pointers to strings"
Diffstat (limited to 'services/audioflinger/AudioPolicyService.cpp')
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 79d4463..3020597 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -43,8 +43,8 @@ namespace android { -static const char *kDeadlockedString = "AudioPolicyService may be deadlocked\n"; -static const char *kCmdDeadlockedString = "AudioPolicyService command thread may be deadlocked\n"; +static const char kDeadlockedString[] = "AudioPolicyService may be deadlocked\n"; +static const char kCmdDeadlockedString[] = "AudioPolicyService command thread may be deadlocked\n"; static const int kDumpLockRetries = 50; static const int kDumpLockSleep = 20000; @@ -1069,7 +1069,7 @@ int AudioPolicyService::setVoiceVolume(float volume, int delayMs) // Audio pre-processing configuration // ---------------------------------------------------------------------------- -const char *AudioPolicyService::kInputSourceNames[AUDIO_SOURCE_CNT -1] = { +/*static*/ const char * const AudioPolicyService::kInputSourceNames[AUDIO_SOURCE_CNT -1] = { MIC_SRC_TAG, VOICE_UL_SRC_TAG, VOICE_DL_SRC_TAG, |