diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-31 16:53:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-31 16:53:23 +0000 |
| commit | 0df5cf5ad70dfd2085a1bec13188350697b932a2 (patch) | |
| tree | 41b58343b72266d404299938d456e6eb1deb5d8c | |
| parent | bd6738b2e11b8861cb4a420f437343b3c80a21c9 (diff) | |
| parent | 167d1a27713ab64cd3c0aa70de96434083ef0400 (diff) | |
| download | frameworks_base-0df5cf5ad70dfd2085a1bec13188350697b932a2.zip frameworks_base-0df5cf5ad70dfd2085a1bec13188350697b932a2.tar.gz frameworks_base-0df5cf5ad70dfd2085a1bec13188350697b932a2.tar.bz2 | |
Merge "Fix typo"
| -rw-r--r-- | media/java/android/media/AudioService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index fe510f6..7f1c5c7 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -1689,7 +1689,7 @@ public class AudioService extends IAudioService.Stub { private static final String ASSET_FILE_VERSION = "1.0"; private static final String GROUP_TOUCH_SOUNDS = "touch_sounds"; - private static final int SOUND_EFECTS_LOAD_TIMEOUT_MS = 5000; + private static final int SOUND_EFFECTS_LOAD_TIMEOUT_MS = 5000; class LoadSoundEffectReply { public int mStatus = 1; @@ -1801,7 +1801,7 @@ public class AudioService extends IAudioService.Stub { sendMsg(mAudioHandler, MSG_LOAD_SOUND_EFFECTS, SENDMSG_QUEUE, 0, 0, reply, 0); while ((reply.mStatus == 1) && (attempts-- > 0)) { try { - reply.wait(SOUND_EFECTS_LOAD_TIMEOUT_MS); + reply.wait(SOUND_EFFECTS_LOAD_TIMEOUT_MS); } catch (InterruptedException e) { Log.w(TAG, "loadSoundEffects Interrupted while waiting sound pool loaded."); } @@ -3289,7 +3289,7 @@ public class AudioService extends IAudioService.Stub { while ((mSoundPoolCallBack == null) && (attempts-- > 0)) { try { // Wait for mSoundPoolCallBack to be set by the other thread - mSoundEffectsLock.wait(SOUND_EFECTS_LOAD_TIMEOUT_MS); + mSoundEffectsLock.wait(SOUND_EFFECTS_LOAD_TIMEOUT_MS); } catch (InterruptedException e) { Log.w(TAG, "Interrupted while waiting sound pool listener thread."); } @@ -3353,7 +3353,7 @@ public class AudioService extends IAudioService.Stub { status = 1; while ((status == 1) && (attempts-- > 0)) { try { - mSoundEffectsLock.wait(SOUND_EFECTS_LOAD_TIMEOUT_MS); + mSoundEffectsLock.wait(SOUND_EFFECTS_LOAD_TIMEOUT_MS); status = mSoundPoolCallBack.status(); } catch (InterruptedException e) { Log.w(TAG, "Interrupted while waiting sound pool callback."); |