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

Merge "Fix typo"

Browse Source
This commit is contained in:
Glenn Kasten
2014-03-31 16:53:23 +00:00
committed by Android (Google) Code Review
parent bd6738b2e1 167d1a2771
commit 0df5cf5ad7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/AudioService.java
View File

@@ -1689,7 +1689,7 @@ public class AudioService extends IAudioService.Stub {
private static final String ASSET_FILE_VERSION = "1.0"; private static final String ASSET_FILE_VERSION = "1.0";
private static final String GROUP_TOUCH_SOUNDS = "touch_sounds"; 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 { class LoadSoundEffectReply {
public int mStatus = 1; 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); sendMsg(mAudioHandler, MSG_LOAD_SOUND_EFFECTS, SENDMSG_QUEUE, 0, 0, reply, 0);
while ((reply.mStatus == 1) && (attempts-- > 0)) { while ((reply.mStatus == 1) && (attempts-- > 0)) {
try { try {
reply.wait(SOUND_EFECTS_LOAD_TIMEOUT_MS); reply.wait(SOUND_EFFECTS_LOAD_TIMEOUT_MS);
} catch (InterruptedException e) { } catch (InterruptedException e) {
Log.w(TAG, "loadSoundEffects Interrupted while waiting sound pool loaded."); 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)) { while ((mSoundPoolCallBack == null) && (attempts-- > 0)) {
try { try {
// Wait for mSoundPoolCallBack to be set by the other thread // 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) { } catch (InterruptedException e) {
Log.w(TAG, "Interrupted while waiting sound pool listener thread."); Log.w(TAG, "Interrupted while waiting sound pool listener thread.");
} }
@@ -3353,7 +3353,7 @@ public class AudioService extends IAudioService.Stub {
status = 1; status = 1;
while ((status == 1) && (attempts-- > 0)) { while ((status == 1) && (attempts-- > 0)) {
try { try {
mSoundEffectsLock.wait(SOUND_EFECTS_LOAD_TIMEOUT_MS); mSoundEffectsLock.wait(SOUND_EFFECTS_LOAD_TIMEOUT_MS);
status = mSoundPoolCallBack.status(); status = mSoundPoolCallBack.status();
} catch (InterruptedException e) { } catch (InterruptedException e) {
Log.w(TAG, "Interrupted while waiting sound pool callback."); Log.w(TAG, "Interrupted while waiting sound pool callback.");