summaryrefslogtreecommitdiffstats
path: root/core/java/android/service
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2012-10-15 09:06:36 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-15 09:06:37 -0700
commit4a01f2b5dcb5bcb72358905db402731013195cfd (patch)
treed56008435a58165b3254637a4bf5867fe833a889 /core/java/android/service
parent87d57952af662a94637c1519b2189e22456af2db (diff)
parentf434d23a16b34e7815049db29bbcd0cd8a4e4862 (diff)
downloadframeworks_base-4a01f2b5dcb5bcb72358905db402731013195cfd.zip
frameworks_base-4a01f2b5dcb5bcb72358905db402731013195cfd.tar.gz
frameworks_base-4a01f2b5dcb5bcb72358905db402731013195cfd.tar.bz2
Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev
Diffstat (limited to 'core/java/android/service')
-rw-r--r--core/java/android/service/dreams/DreamService.java19
1 files changed, 12 insertions, 7 deletions
diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java
index c72b714..4820c5e 100644
--- a/core/java/android/service/dreams/DreamService.java
+++ b/core/java/android/service/dreams/DreamService.java
@@ -612,18 +612,23 @@ public class DreamService extends Service implements Window.Callback {
View.SYSTEM_UI_FLAG_LOW_PROFILE);
getWindowManager().addView(mWindow.getDecorView(), mWindow.getAttributes());
} catch (Throwable t) {
- Slog.w("Crashed adding window view", t);
+ Slog.w(TAG, "Crashed adding window view", t);
safelyFinish();
return;
}
// start it up
- try {
- onDreamingStarted();
- } catch (Throwable t) {
- Slog.w("Crashed in onDreamingStarted()", t);
- safelyFinish();
- }
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ onDreamingStarted();
+ } catch (Throwable t) {
+ Slog.w(TAG, "Crashed in onDreamingStarted()", t);
+ safelyFinish();
+ }
+ }
+ });
}
private void safelyFinish() {