diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-06-30 22:02:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-30 22:02:34 +0000 |
| commit | 96496e2d17607a8bfa944461c2458b0dcdeee872 (patch) | |
| tree | 82949f98f2e4c9474800b9e89e50a38eb7c5813b | |
| parent | 71699d760eff662055dde458ea0d614a32fb6dfc (diff) | |
| parent | 7e3b61e73d6971c35acfa0798eb4d8da412ec3af (diff) | |
| download | frameworks_base-96496e2d17607a8bfa944461c2458b0dcdeee872.zip frameworks_base-96496e2d17607a8bfa944461c2458b0dcdeee872.tar.gz frameworks_base-96496e2d17607a8bfa944461c2458b0dcdeee872.tar.bz2 | |
Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java | 2 |
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 8575839..a7de1e6 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; |