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

am bf7d8ecb: Merge "Close XmlResourceParser when finish parsing" 

* commit 'bf7d8ecb48b1d47d6555d508d0c6a56e0a06efd2':
  Close XmlResourceParser when finish parsing
main
Tadashi G. Takaoka 2011-10-17 19:12:36 -07:00 committed by Android Git Automerger
parent f0ecb19fdd bf7d8ecb48
commit 14be523330
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
View File

@ -19,6 +19,7 @@ package com.android.inputmethod.keyboard.internal;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.content.res.XmlResourceParser;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
@ -268,14 +269,17 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
public KeyboardBuilder<KP> load(KeyboardId id) { public KeyboardBuilder<KP> load(KeyboardId id) {
mParams.mId = id; mParams.mId = id;
final XmlResourceParser parser = mResources.getXml(id.getXmlId());
try { try {
parseKeyboard(id.getXmlId()); parseKeyboard(parser);
} catch (XmlPullParserException e) { } catch (XmlPullParserException e) {
Log.w(TAG, "keyboard XML parse error: " + e); Log.w(TAG, "keyboard XML parse error: " + e);
throw new IllegalArgumentException(e); throw new IllegalArgumentException(e);
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "keyboard XML parse error: " + e); Log.w(TAG, "keyboard XML parse error: " + e);
throw new RuntimeException(e); throw new RuntimeException(e);
} finally {
parser.close();
} }
return this; return this;
} }
@ -288,9 +292,9 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
return new Keyboard(mParams); return new Keyboard(mParams);
} }
private void parseKeyboard(int resId) throws XmlPullParserException, IOException { private void parseKeyboard(XmlResourceParser parser)
throws XmlPullParserException, IOException {
if (DEBUG) Log.d(TAG, String.format("<%s> %s", TAG_KEYBOARD, mParams.mId)); if (DEBUG) Log.d(TAG, String.format("<%s> %s", TAG_KEYBOARD, mParams.mId));
final XmlPullParser parser = mResources.getXml(resId);
int event; int event;
while ((event = parser.next()) != XmlPullParser.END_DOCUMENT) { while ((event = parser.next()) != XmlPullParser.END_DOCUMENT) {
if (event == XmlPullParser.START_TAG) { if (event == XmlPullParser.START_TAG) {
@ -535,7 +539,12 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
throw new ParseException("No keyboardLayout attribute in <include/>", parser); throw new ParseException("No keyboardLayout attribute in <include/>", parser);
if (DEBUG) Log.d(TAG, String.format("<%s keyboardLayout=%s />", if (DEBUG) Log.d(TAG, String.format("<%s keyboardLayout=%s />",
TAG_INCLUDE, mResources.getResourceEntryName(keyboardLayout))); TAG_INCLUDE, mResources.getResourceEntryName(keyboardLayout)));
parseMerge(mResources.getLayout(keyboardLayout), row, skip); final XmlResourceParser parserForInclude = mResources.getXml(keyboardLayout);
try {
parseMerge(parserForInclude, row, skip);
} finally {
parserForInclude.close();
}
} }
} }