Merge "Fix build." into jb-mr2-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
index f7ddbc66e645..09e68785231d 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
@@ -24,6 +24,7 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.view.IWindow;
+import android.view.IWindowId;
 import android.view.IWindowSession;
 import android.view.InputChannel;
 import android.view.Surface;
@@ -199,4 +200,10 @@ public final class BridgeWindowSession implements IWindowSession {
     public void onRectangleOnScreenRequested(IBinder window, Rect rectangle, boolean immediate) {
         // pass for now.
     }
+
+    @Override
+    public IWindowId getWindowId(IBinder window) throws RemoteException {
+        // pass for now.
+        return null;
+    }
 }