diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-06-30 22:17:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-30 22:17:55 +0000 |
| commit | 3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992 (patch) | |
| tree | e33a2f911946ebdf35e9a94e77e1062e581b6c3c | |
| parent | a4ac253bc36bbced5acad8a7ddf1838b11f6e44c (diff) | |
| parent | 96496e2d17607a8bfa944461c2458b0dcdeee872 (diff) | |
| download | frameworks_base-3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992.zip frameworks_base-3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992.tar.gz frameworks_base-3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992.tar.bz2 | |
am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
* commit '96496e2d17607a8bfa944461c2458b0dcdeee872':
Build fix after changing IWindowSession.
| -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; |