From 4a0199a8993c020abbdd4dc9ff8b47b650a5897a Mon Sep 17 00:00:00 2001
From: Ray Essick <essick@google.com>
Date: Wed, 3 Jul 2019 16:42:40 +0000
Subject: [PATCH] Revert "Preload sfplugin_ccodec for performance"

This reverts commit 30da74bda4106515c18147edf004bbe021d0d27e.

Reason for revert: occasional audio race, losing volume control for device

Bug: 133186424
Bug: 135763139
Change-Id: I3aca2780dfcf80cfe0095af2a40496f3af0733cd
---
 core/java/com/android/internal/os/ZygoteInit.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 3c87710a21ee9..f9e868fafe505 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -189,13 +189,6 @@ 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();