diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-07-01 17:51:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-01 17:51:18 +0000 |
| commit | 81f8cd92fa003a8625df1098662d0afa50f07e89 (patch) | |
| tree | fa921cbce2190039d26695775f5b43b8d48f2bf0 /tools | |
| parent | 32207e3c66f9b7979a6d465b87eb531327916081 (diff) | |
| parent | 3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992 (diff) | |
| download | frameworks_base-81f8cd92fa003a8625df1098662d0afa50f07e89.zip frameworks_base-81f8cd92fa003a8625df1098662d0afa50f07e89.tar.gz frameworks_base-81f8cd92fa003a8625df1098662d0afa50f07e89.tar.bz2 | |
am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
* commit '3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992':
Build fix after changing IWindowSession.
Diffstat (limited to 'tools')
| -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 c92df6d..bea1f86 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; |