diff options
| author |   satok <satok@google.com> | 2010-06-08 11:45:21 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-06-09 00:01:21 +0900 |
| commit | acbe38f3e12ce5af668c687296908a1787c85ad9 (patch) | |
| tree | 2cabd91bba8470aa7a0d85dcb5d87a8da269171e /java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | |
| parent | 3a7adf6569047add089ba5f879a932d281836ee3 (diff) | |
| download | latinime-acbe38f3e12ce5af668c687296908a1787c85ad9.tar.gz latinime-acbe38f3e12ce5af668c687296908a1787c85ad9.tar.xz latinime-acbe38f3e12ce5af668c687296908a1787c85ad9.zip | |
Try GC at OutOfMemoryError
Change-Id: Icfaecc6a0e8858622649ce9115ab94b00e240cc2
Diffstat (limited to 'java/src/com/android/inputmethod/latin/KeyboardSwitcher.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index a8be2fd44..ba78a902d 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -389,11 +389,18 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha if (LAYOUTS.length <= newLayout) { newLayout = Integer.valueOf(DEFAULT_LAYOUT_ID); } - try { - mInputView = (LatinKeyboardView) mInputMethodService.getLayoutInflater().inflate( - LAYOUTS[newLayout], null); - } catch (OutOfMemoryError e) { - LatinImeLogger.logOnException(mLayoutId + "," + newLayout, e); + + LatinIMEUtil.GCUtils.getInstance().reset(); + boolean tryGC = true; + for (int i = 0; i < LatinIMEUtil.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) { + try { + mInputView = (LatinKeyboardView) mInputMethodService.getLayoutInflater( + ).inflate(LAYOUTS[newLayout], null); + tryGC = false; + } catch (OutOfMemoryError e) { + tryGC = LatinIMEUtil.GCUtils.getInstance().tryGCOrWait( + mLayoutId + "," + newLayout, e); + } } mInputView.setExtentionLayoutResId(LAYOUTS[newLayout]); mInputView.setOnKeyboardActionListener(mInputMethodService); |