Merge "Fix build due to missing abstract method impl" into nyc-dev

2016-06-22 22:20:54 +00:00
parent dea7aa0da1 0f5caab576
commit aeef7c4748
1 changed files with 6 additions and 0 deletions
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1798,6 +1798,12 @@ public final class BridgeContext extends Context {
        return null;
    }

+    @Override
+    public Display getDisplay() {
+        // pass
+        return null;
+    }
+
    @Override
    public int getUserId() {
        return 0; // not used