am a8b7451b: am 027448e0: Remove an unnecessary thread.

* commit 'a8b7451b31872d217cd61b7d0e6fbbf7221781c8':
  Remove an unnecessary thread.
main
Ken Wakasa 2012-06-02 09:07:51 -07:00 committed by Android Git Automerger
commit 4a9e5d2c95
1 changed files with 8 additions and 4 deletions

View File

@ -126,8 +126,9 @@ public class Utils {
} }
public static RingCharBuffer init(InputMethodService context, boolean enabled, public static RingCharBuffer init(InputMethodService context, boolean enabled,
boolean usabilityStudy) { boolean usabilityStudy) {
if (!(enabled || usabilityStudy)) return null;
sRingCharBuffer.mContext = context; sRingCharBuffer.mContext = context;
sRingCharBuffer.mEnabled = enabled || usabilityStudy; sRingCharBuffer.mEnabled = true;
UsabilityStudyLogUtils.getInstance().init(context); UsabilityStudyLogUtils.getInstance().init(context);
return sRingCharBuffer; return sRingCharBuffer;
} }
@ -221,8 +222,6 @@ public class Utils {
// TODO: remove code duplication with ResearchLog class // TODO: remove code duplication with ResearchLog class
private static final String USABILITY_TAG = UsabilityStudyLogUtils.class.getSimpleName(); private static final String USABILITY_TAG = UsabilityStudyLogUtils.class.getSimpleName();
private static final String FILENAME = "log.txt"; private static final String FILENAME = "log.txt";
private static final UsabilityStudyLogUtils sInstance =
new UsabilityStudyLogUtils();
private final Handler mLoggingHandler; private final Handler mLoggingHandler;
private File mFile; private File mFile;
private File mDirectory; private File mDirectory;
@ -241,8 +240,13 @@ public class Utils {
mLoggingHandler = new Handler(handlerThread.getLooper()); mLoggingHandler = new Handler(handlerThread.getLooper());
} }
// Initialization-on-demand holder
private static class OnDemandInitializationHolder {
public static final UsabilityStudyLogUtils sInstance = new UsabilityStudyLogUtils();
}
public static UsabilityStudyLogUtils getInstance() { public static UsabilityStudyLogUtils getInstance() {
return sInstance; return OnDemandInitializationHolder.sInstance;
} }
public void init(InputMethodService ims) { public void init(InputMethodService ims) {