nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix Keyboard.getKey as thread safe"

main
Tadashi G. Takaoka 2012-07-04 19:58:17 -07:00 committed by Android (Google) Code Review
parent 7b40c68277 8f6c603b3b
commit 7aeb7ef1ab
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
java/src/com/android/inputmethod/keyboard/Keyboard.java
View File

@ -185,19 +185,21 @@ public class Keyboard {
if (code == CODE_UNSPECIFIED) {
return null;
}
final int index = mKeyCache.indexOfKey(code);
if (index >= 0) {
return mKeyCache.valueAt(index);
}
for (final Key key : mKeys) {
if (key.mCode == code) {
mKeyCache.put(code, key);
return key;
synchronized (mKeyCache) {
final int index = mKeyCache.indexOfKey(code);
if (index >= 0) {
return mKeyCache.valueAt(index);
}
for (final Key key : mKeys) {
if (key.mCode == code) {
mKeyCache.put(code, key);
return key;
}
}
mKeyCache.put(code, null);
return null;
}
mKeyCache.put(code, null);
return null;
}
public boolean hasKey(Key aKey) {