diff options
| author | Chad Jones <chadj@google.com> | 2015-02-23 21:17:58 -0800 |
|---|---|---|
| committer | Chad Jones <chadj@google.com> | 2015-02-23 21:19:58 -0800 |
| commit | 1fb55286438967f82e305a8449c0528a7cd07fce (patch) | |
| tree | 30bca6153975a4ae82db73c851905ebf90722292 /tools | |
| parent | 39fee05ea25c68f6e5156483cc5e5cc44e9b09d9 (diff) | |
| parent | 57bb5f5c8bf1875d2c6843237f518e5a1f9fe597 (diff) | |
| download | frameworks_base-1fb55286438967f82e305a8449c0528a7cd07fce.zip frameworks_base-1fb55286438967f82e305a8449c0528a7cd07fce.tar.gz frameworks_base-1fb55286438967f82e305a8449c0528a7cd07fce.tar.bz2 | |
resolved conflicts for merge of 57bb5f5c to master
Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java | 5 |
1 files changed, 5 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 62a03e1..4289689 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 @@ -206,4 +206,9 @@ public final class BridgeWindowSession implements IWindowSession { // pass for now. return null; } + + @Override + public void pokeDrawLock(IBinder window) { + // pass for now. + } } |