Upstream version 10.39.226.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / android / core_internal / src / org / xwalk / core / internal / ReflectionHelper.java

diff --git a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/ReflectionHelper.java b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/ReflectionHelper.java
index 883a448..c7299f2 100644 (file)
--- a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/ReflectionHelper.java
+++ b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/ReflectionHelper.java
@@ -73,24 +73,49 @@ public class ReflectionHelper {
     private final static String LIBRARY_APK_PACKAGE = "org.xwalk.core";
     /* Wrapper Only
     private static boolean sAllowCrossPackage = false;
+    private static boolean sAlreadyUsingLibrary = false;
     private static SharedXWalkExceptionHandler sExceptionHandler = null;
 
     static void setExceptionHandler(SharedXWalkExceptionHandler handler) {
         sExceptionHandler = handler;
     }
 
-    public static boolean shouldUseLibrary() {
+    static boolean isUsingLibrary() {
+        return sAlreadyUsingLibrary;
+    }
+
+    static boolean shouldUseLibrary() {
+        if (sAlreadyUsingLibrary) return true;
+
         // TODO(wang16): There are many other conditions here.
         // e.g. Whether application uses the ApplicationClass we provided,
         //      Whether native library arch is correct.
         assert isWrapper();
+        Class<?> delegateClass = null;
         try {
-            ReflectionHelper.class.getClassLoader().loadClass(
-                    INTERNAL_PACKAGE + "." + "ReflectionHelper");
-            return false;
+            ClassLoader classLoader = ReflectionHelper.class.getClassLoader();
+            delegateClass = classLoader.loadClass(
+                    INTERNAL_PACKAGE + "." + "XWalkViewDelegate");
         } catch (ClassNotFoundException e) {
             return true;
         }
+        if (delegateClass == null) return true;
+        try {
+            Method loadXWalkLibrary = delegateClass.getDeclaredMethod(
+                    "loadXWalkLibrary", Context.class);
+            loadXWalkLibrary.invoke(null, (Context)null);
+        } catch (NoSuchMethodException e) {
+            return true;
+        } catch (IllegalArgumentException e) {
+            return true;
+        } catch (IllegalAccessException e) {
+            return true;
+        } catch (InvocationTargetException e) {
+            return true;
+        } catch (UnsatisfiedLinkError e) {
+            return true;
+        }
+        return false;
     }
     Wrapper Only */
 
@@ -121,6 +146,7 @@ public class ReflectionHelper {
                 sBridgeContext = app.createPackageContext(
                         LIBRARY_APK_PACKAGE,
                         Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
+                sAlreadyUsingLibrary = true;
             } catch (PackageManager.NameNotFoundException e) {
                 handleException(e);
             }
@@ -276,13 +302,26 @@ public class ReflectionHelper {
                 methodName = "getWrapper";
             }
             try {
-                method = clazz.getMethod(methodName);
+                method = clazz.getDeclaredMethod(methodName);
             } catch (NoSuchMethodException e) {
                 handleException(e);
             }
-            if (method != null) sBridgeWrapperMap.put(clazz, method);
+
+            if (method == null)  {
+                return invokeMethod(method, instance);
+            } else {
+                sBridgeWrapperMap.put(clazz, method);
+            }
         }
-        return invokeMethod(method, instance);
+
+        if (method.isAccessible()) return invokeMethod(method, instance);
+
+        // This is to enable the accessibility of getBridge temporarily.
+        // It's not public for documentation generating.
+        method.setAccessible(true);
+        Object ret = invokeMethod(method, instance);
+        method.setAccessible(false);
+        return ret;
     }
 
     private static boolean isWrapper() {