From 66e9a9d97f596b9d45142e5f4d3b1b25bc1b984f Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Wed, 27 Dec 2017 20:57:28 +0200
Subject: AudioFX: Remove cyngn remnants

Change-Id: I332bd428d2704bb60fe753e2caaa660041f64f4a
---
 Android.mk                                         |  8 -----
 .../audiofx/backends/EffectsFactory.java           | 35 ++++++++++++++++++++++
 .../audiofx/backends/EffectsFactory.java           | 35 ----------------------
 tests/Android.mk                                   |  5 ----
 4 files changed, 35 insertions(+), 48 deletions(-)
 create mode 100644 src/org/cyanogenmod/audiofx/backends/EffectsFactory.java
 delete mode 100644 src_effects/org/cyanogenmod/audiofx/backends/EffectsFactory.java

diff --git a/Android.mk b/Android.mk
index 2c5bb65..63e3369 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,14 +6,6 @@ LOCAL_MODULE_TAGS	:= optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-ifeq ($(wildcard $(LOCAL_PATH)/src_effects_priv),)
-LOCAL_SRC_FILES += $(call all-java-files-under, src_effects)
-else
-$(warning *** including private implementations of effects ***)
-LOCAL_AAPT_FLAGS += --rename-manifest-package com.cyngn.audiofx
-LOCAL_SRC_FILES += $(call all-java-files-under, src_effects_priv)
-endif
-
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 org.lineageos.platform.sdk
 
 LOCAL_PROGUARD_ENABLED := disabled
diff --git a/src/org/cyanogenmod/audiofx/backends/EffectsFactory.java b/src/org/cyanogenmod/audiofx/backends/EffectsFactory.java
new file mode 100644
index 0000000..20d6a40
--- /dev/null
+++ b/src/org/cyanogenmod/audiofx/backends/EffectsFactory.java
@@ -0,0 +1,35 @@
+package org.cyanogenmod.audiofx.backends;
+
+import org.cyanogenmod.audiofx.Constants;
+
+import android.content.Context;
+import android.media.AudioDeviceInfo;
+
+/**
+ * Creates an EffectSet appropriate for the current device
+ */
+public class EffectsFactory implements IEffectFactory {
+
+    private static final String TAG = "AudioFx-EffectsFactory";
+
+    private static int sBrand = -1; // cached value to not hit io every time we need a new effect
+
+    public EffectSet createEffectSet(Context context, int sessionId,
+            AudioDeviceInfo currentDevice) {
+        // if this throws, we're screwed, don't bother to recover. these
+        // are the standard effects that every android device must have,
+        // and if they don't exist we have bigger problems.
+        return new AndroidEffects(sessionId, currentDevice);
+    }
+
+    public static int getBrand() {
+        if (sBrand == -1) {
+            sBrand = getBrandInternal();
+        }
+        return sBrand;
+    }
+
+    private static int getBrandInternal() {
+        return Constants.EFFECT_TYPE_ANDROID;
+    }
+}
diff --git a/src_effects/org/cyanogenmod/audiofx/backends/EffectsFactory.java b/src_effects/org/cyanogenmod/audiofx/backends/EffectsFactory.java
deleted file mode 100644
index 20d6a40..0000000
--- a/src_effects/org/cyanogenmod/audiofx/backends/EffectsFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.cyanogenmod.audiofx.backends;
-
-import org.cyanogenmod.audiofx.Constants;
-
-import android.content.Context;
-import android.media.AudioDeviceInfo;
-
-/**
- * Creates an EffectSet appropriate for the current device
- */
-public class EffectsFactory implements IEffectFactory {
-
-    private static final String TAG = "AudioFx-EffectsFactory";
-
-    private static int sBrand = -1; // cached value to not hit io every time we need a new effect
-
-    public EffectSet createEffectSet(Context context, int sessionId,
-            AudioDeviceInfo currentDevice) {
-        // if this throws, we're screwed, don't bother to recover. these
-        // are the standard effects that every android device must have,
-        // and if they don't exist we have bigger problems.
-        return new AndroidEffects(sessionId, currentDevice);
-    }
-
-    public static int getBrand() {
-        if (sBrand == -1) {
-            sBrand = getBrandInternal();
-        }
-        return sBrand;
-    }
-
-    private static int getBrandInternal() {
-        return Constants.EFFECT_TYPE_ANDROID;
-    }
-}
diff --git a/tests/Android.mk b/tests/Android.mk
index 8c33b81..4b82cec 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -19,11 +19,6 @@ LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_JACK_ENABLED := disabled
 
-# Sign the package when not using test-keys
-ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
-LOCAL_CERTIFICATE := cyngn-app
-endif
-
 include $(BUILD_PACKAGE)
 
 include $(CLEAR_VARS)
-- 
cgit v1.2.3