Merge "Preload sfplugin_ccodec for performance" into qt-dev

am: 878a6b2015 Change-Id: Idae0ffb08ba0027b94bb0ff55f70af6dca7e2bd3
2019-07-02 10:59:30 -07:00
parent e9acb9c566 878a6b2015
commit 0ef82ad076
1 changed files with 7 additions and 0 deletions
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -188,6 +188,13 @@ public class ZygoteInit {
        System.loadLibrary("android");
        System.loadLibrary("compiler_rt");
        System.loadLibrary("jnigraphics");
+
+        // tolerate missing sfplugin_ccodec which is only present on Codec 2 devices
+        try {
+            System.loadLibrary("sfplugin_ccodec");
+        } catch (Error | RuntimeException e) {
+            Log.w(TAG, "Problem preloading sfplugin_ccodec: " + e);
+        }
    }

    native private static void nativePreloadAppProcessHALs();