summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Filip Gruszczynski <gruszczy@google.com> 2015-07-02 00:59:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-02 00:59:10 +0000
commitd13e55df82cbec6f669ad3af590b613ca491ade3 (patch)
tree1c7ebb77d2e855219bb94d82c9c3fdb4dd6748fd
parentb35522f77d0d3d5ed2090214c776c476c8fc76cc (diff)
parentccb4908db44871994084ce8375a7243431b665ac (diff)
am ccb4908d: am 81f8cd92: am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
* commit 'ccb4908db44871994084ce8375a7243431b665ac': Build fix after changing IWindowSession.
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java2
1 files changed, 1 insertions, 1 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 c92df6df3c3c..bea1f86907e0 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
@@ -47,7 +47,7 @@ public final class BridgeWindowSession implements IWindowSession {
@Override
public int addToDisplay(IWindow arg0, int seq, LayoutParams arg1, int arg2, int displayId,
- Rect arg3, Rect arg4, InputChannel outInputchannel)
+ Rect arg3, Rect arg4, Rect arg5, InputChannel outInputchannel)
throws RemoteException {
// pass for now.
return 0;