Merge "Supports wallpaper for multi display, API change."

1 files changed, 4 insertions, 3 deletions

diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index 9f2c8c1..f2c7411 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -458,16 +458,17 @@ public class LiveWallpaperPreview extends Activity {
                 mService = null;
             }
         }
-        
+
         public void onServiceConnected(ComponentName name, IBinder service) {
             if (mWallpaperConnection == this) {
                 mService = IWallpaperService.Stub.asInterface(service);
                 try {
+                    final int displayId = getWindow().getDecorView().getDisplay().getDisplayId();
                     final View root = getWindow().getDecorView();
                     mService.attach(this, root.getWindowToken(),
                             LayoutParams.TYPE_APPLICATION_MEDIA,
                             true, root.getWidth(), root.getHeight(),
-                            new Rect(0, 0, 0, 0));
+                            new Rect(0, 0, 0, 0), displayId);
                 } catch (RemoteException e) {
                     Log.w(LOG_TAG, "Failed attaching wallpaper; clearing", e);
                 }
@@ -482,7 +483,7 @@ public class LiveWallpaperPreview extends Activity {
             }
         }
         
-        public void attachEngine(IWallpaperEngine engine) {
+        public void attachEngine(IWallpaperEngine engine, int displayId) {
             synchronized (this) {
                 if (mConnected) {
                     mEngine = engine;