Upstream version 6.35.131.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / android / runtime / src / org / xwalk / runtime / MixedContext.java

diff --git a/src/xwalk/runtime/android/runtime/src/org/xwalk/runtime/MixedContext.java b/src/xwalk/runtime/android/runtime/src/org/xwalk/runtime/MixedContext.java
index 612b8a1..c6797f2 100644 (file)
--- a/src/xwalk/runtime/android/runtime/src/org/xwalk/runtime/MixedContext.java
+++ b/src/xwalk/runtime/android/runtime/src/org/xwalk/runtime/MixedContext.java
@@ -42,6 +42,9 @@ class MixedContext extends ContextWrapper {
 
     @Override
     public Object getSystemService(String name) {
+        if (name.equals(Context.LAYOUT_INFLATER_SERVICE)) {
+            return super.getSystemService(name);
+        }
         return mActivityCtx.getSystemService(name);
     }
 }