am 5d0a560c: am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev

* commit '5d0a560ca4e455bfe8f77c2872a479e210b38dcf':
  delay onDreamingStarted() to work around asynchrony.
This commit is contained in:
Chris Wren
2012-10-15 09:10:21 -07:00
committed by Android Git Automerger

View File

@@ -612,19 +612,24 @@ public class DreamService extends Service implements Window.Callback {
View.SYSTEM_UI_FLAG_LOW_PROFILE); View.SYSTEM_UI_FLAG_LOW_PROFILE);
getWindowManager().addView(mWindow.getDecorView(), mWindow.getAttributes()); getWindowManager().addView(mWindow.getDecorView(), mWindow.getAttributes());
} catch (Throwable t) { } catch (Throwable t) {
Slog.w("Crashed adding window view", t); Slog.w(TAG, "Crashed adding window view", t);
safelyFinish(); safelyFinish();
return; return;
} }
// start it up // start it up
mHandler.post(new Runnable() {
@Override
public void run() {
try { try {
onDreamingStarted(); onDreamingStarted();
} catch (Throwable t) { } catch (Throwable t) {
Slog.w("Crashed in onDreamingStarted()", t); Slog.w(TAG, "Crashed in onDreamingStarted()", t);
safelyFinish(); safelyFinish();
} }
} }
});
}
private void safelyFinish() { private void safelyFinish() {
if (mDebug) Slog.v(TAG, "safelyFinish()"); if (mDebug) Slog.v(TAG, "safelyFinish()");