Try GC at OutOfMemoryError
Change-Id: Icfaecc6a0e8858622649ce9115ab94b00e240cc2
This commit is contained in:
parent
3a7adf6569
commit
acbe38f3e1
5 changed files with 96 additions and 14 deletions
|
@ -389,11 +389,18 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
|
||||||
if (LAYOUTS.length <= newLayout) {
|
if (LAYOUTS.length <= newLayout) {
|
||||||
newLayout = Integer.valueOf(DEFAULT_LAYOUT_ID);
|
newLayout = Integer.valueOf(DEFAULT_LAYOUT_ID);
|
||||||
}
|
}
|
||||||
try {
|
|
||||||
mInputView = (LatinKeyboardView) mInputMethodService.getLayoutInflater().inflate(
|
LatinIMEUtil.GCUtils.getInstance().reset();
|
||||||
LAYOUTS[newLayout], null);
|
boolean tryGC = true;
|
||||||
} catch (OutOfMemoryError e) {
|
for (int i = 0; i < LatinIMEUtil.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
|
||||||
LatinImeLogger.logOnException(mLayoutId + "," + newLayout, e);
|
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.setExtentionLayoutResId(LAYOUTS[newLayout]);
|
||||||
mInputView.setOnKeyboardActionListener(mInputMethodService);
|
mInputView.setOnKeyboardActionListener(mInputMethodService);
|
||||||
|
|
|
@ -291,11 +291,18 @@ public class LatinIME extends InputMethodService
|
||||||
if (inputLanguage == null) {
|
if (inputLanguage == null) {
|
||||||
inputLanguage = conf.locale.toString();
|
inputLanguage = conf.locale.toString();
|
||||||
}
|
}
|
||||||
try {
|
|
||||||
initSuggest(inputLanguage);
|
LatinIMEUtil.GCUtils.getInstance().reset();
|
||||||
} catch (OutOfMemoryError e) {
|
boolean tryGC = true;
|
||||||
LatinImeLogger.logOnException(inputLanguage, e);
|
for (int i = 0; i < LatinIMEUtil.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
|
||||||
|
try {
|
||||||
|
initSuggest(inputLanguage);
|
||||||
|
tryGC = false;
|
||||||
|
} catch (OutOfMemoryError e) {
|
||||||
|
tryGC = LatinIMEUtil.GCUtils.getInstance().tryGCOrWait(inputLanguage, e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mOrientation = conf.orientation;
|
mOrientation = conf.orientation;
|
||||||
initSuggestPuncList();
|
initSuggestPuncList();
|
||||||
|
|
||||||
|
|
63
java/src/com/android/inputmethod/latin/LatinIMEUtil.java
Normal file
63
java/src/com/android/inputmethod/latin/LatinIMEUtil.java
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2010 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.inputmethod.latin;
|
||||||
|
|
||||||
|
import android.text.format.DateUtils;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
public class LatinIMEUtil {
|
||||||
|
public static class GCUtils {
|
||||||
|
private static final String TAG = "GCUtils";
|
||||||
|
public static final int GC_TRY_COUNT = 2;
|
||||||
|
// GC_TRY_LOOP_MAX is used for the hard limit of GC wait,
|
||||||
|
// GC_TRY_LOOP_MAX should be GC_TRY_COUNT.
|
||||||
|
public static final int GC_TRY_LOOP_MAX = 5;
|
||||||
|
private static final long GC_INTERVAL = DateUtils.SECOND_IN_MILLIS;
|
||||||
|
private static GCUtils sInstance = new GCUtils();
|
||||||
|
private int mGCTryCount = 0;
|
||||||
|
|
||||||
|
public static GCUtils getInstance() {
|
||||||
|
return sInstance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void reset() {
|
||||||
|
mGCTryCount = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean tryGCOrWait(String metaData, OutOfMemoryError oome) {
|
||||||
|
if (LatinImeLogger.sDBG) {
|
||||||
|
Log.d(TAG, "Encountered Out of memory Error. Try GC.");
|
||||||
|
}
|
||||||
|
if (mGCTryCount == 0) {
|
||||||
|
System.gc();
|
||||||
|
}
|
||||||
|
if (++mGCTryCount > GC_TRY_COUNT) {
|
||||||
|
LatinImeLogger.logOnException(metaData, oome);
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
Thread.sleep(GC_INTERVAL);
|
||||||
|
return true;
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
Log.e(TAG, "Sleep was interrupted.");
|
||||||
|
LatinImeLogger.logOnException(metaData, oome);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -37,7 +37,7 @@ import java.util.List;
|
||||||
|
|
||||||
public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChangeListener {
|
public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChangeListener {
|
||||||
private static final String TAG = "LatinIMELogs";
|
private static final String TAG = "LatinIMELogs";
|
||||||
private static boolean sDBG = false;
|
public static boolean sDBG = false;
|
||||||
private static boolean sLOGPRINT = false;
|
private static boolean sLOGPRINT = false;
|
||||||
// SUPPRESS_EXCEPTION should be true when released to public.
|
// SUPPRESS_EXCEPTION should be true when released to public.
|
||||||
private static final boolean SUPPRESS_EXCEPTION = true;
|
private static final boolean SUPPRESS_EXCEPTION = true;
|
||||||
|
|
|
@ -472,10 +472,15 @@ public class LatinKeyboardView extends KeyboardView {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void draw(Canvas c) {
|
public void draw(Canvas c) {
|
||||||
try {
|
LatinIMEUtil.GCUtils.getInstance().reset();
|
||||||
super.draw(c);
|
boolean tryGC = true;
|
||||||
} catch (OutOfMemoryError e) {
|
for (int i = 0; i < LatinIMEUtil.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) {
|
||||||
LatinImeLogger.logOnException("draw in LatinKeybaordView", e);
|
try {
|
||||||
|
super.draw(c);
|
||||||
|
tryGC = false;
|
||||||
|
} catch (OutOfMemoryError e) {
|
||||||
|
tryGC = LatinIMEUtil.GCUtils.getInstance().tryGCOrWait("LatinKeyboardView", e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (DEBUG_AUTO_PLAY) {
|
if (DEBUG_AUTO_PLAY) {
|
||||||
if (mPlaying) {
|
if (mPlaying) {
|
||||||
|
|
Loading…
Reference in a new issue