Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev

This commit is contained in:
Sascha Prueter
2012-12-17 10:42:55 -08:00
committed by Android (Google) Code Review

View File

@@ -3849,16 +3849,20 @@ public class Editor {
@Override
public void handleMessage(Message msg) {
final int code = msg.what;
if (code == 0) { /* CODE_WORD_ADDED */
if (!(msg.obj instanceof Bundle)) {
Log.w(TAG, "Illegal message. Abort handling onUserDictionaryAdded.");
switch(msg.what) {
case 0: /* CODE_WORD_ADDED */
case 2: /* CODE_ALREADY_PRESENT */
if (!(msg.obj instanceof Bundle)) {
Log.w(TAG, "Illegal message. Abort handling onUserDictionaryAdded.");
return;
}
final Bundle bundle = (Bundle)msg.obj;
final String originalWord = bundle.getString("originalWord");
final String addedWord = bundle.getString("word");
onUserDictionaryAdded(originalWord, addedWord);
return;
default:
return;
}
final Bundle bundle = (Bundle)msg.obj;
final String originalWord = bundle.getString("originalWord");
final String addedWord = bundle.getString("word");
onUserDictionaryAdded(originalWord, addedWord);
}
}