diff options
| author | Mita Yun <mitayun@google.com> | 2012-12-10 16:50:22 -0800 |
|---|---|---|
| committer | Mita Yun <mitayun@google.com> | 2012-12-10 16:50:22 -0800 |
| commit | d44280e28884085f014806d53413ec5a68d0ac25 (patch) | |
| tree | 1c255c754481f793390ad10ee03366ab775845cc /core/java/android/service/wallpaper | |
| parent | f930fee835ab51400509c054f9a850715ddc6c24 (diff) | |
| parent | ebcbfb3fc7750e2873a3e7c6c707fa4e203089b6 (diff) | |
| download | frameworks_base-d44280e28884085f014806d53413ec5a68d0ac25.zip frameworks_base-d44280e28884085f014806d53413ec5a68d0ac25.tar.gz frameworks_base-d44280e28884085f014806d53413ec5a68d0ac25.tar.bz2 | |
resolved conflicts for merge of ebcbfb3f to master
Change-Id: I0658dd4a1418fbad91d9663e5b52418a979dc683
Diffstat (limited to 'core/java/android/service/wallpaper')
| -rw-r--r-- | core/java/android/service/wallpaper/WallpaperService.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 500bb2c..0f735e8 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -960,7 +960,13 @@ public abstract class WallpaperService extends Service { IWallpaperEngineWrapper(WallpaperService context, IWallpaperConnection conn, IBinder windowToken, int windowType, boolean isPreview, int reqWidth, int reqHeight) { - mCaller = new HandlerCaller(context, context.getMainLooper(), this); + if (DEBUG && mCallbackLooper != null) { + mCallbackLooper.setMessageLogging(new LogPrinter(Log.VERBOSE, TAG)); + } + mCaller = new HandlerCaller(context, + mCallbackLooper != null + ? mCallbackLooper : context.getMainLooper(), + this, true /*asyncHandler*/); mConnection = conn; mWindowToken = windowToken; mWindowType = windowType; |