summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2016-06-22 22:20:54 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-22 22:20:56 +0000
commitaeef7c47487e5aafa68563399e9a9088d01fa04c (patch)
treec9d79f1d7f90d816ded6d5d8e0c24ee6a6fde668
parentdea7aa0da11bbdb0da7141d945d5aabb1d0426d6 (diff)
parent0f5caab5762d9ace8e7d87e29296bcb8fdfe9b4b (diff)
Merge "Fix build due to missing abstract method impl" into nyc-dev
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index f87269b7c9f7..616cb5761402 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1799,6 +1799,12 @@ public final class BridgeContext extends Context {
}
@Override
+ public Display getDisplay() {
+ // pass
+ return null;
+ }
+
+ @Override
public int getUserId() {
return 0; // not used
}