From 2475fdaade084dfc1e7549960ad00c9062cf77f1 Mon Sep 17 00:00:00 2001
From: Greg Kaiser <gkaiser@google.com>
Date: Mon, 12 Apr 2021 22:49:40 +0000
Subject: [PATCH] Revert "Moves the redfin FCM back down to level 5."

Revert submission 14143327-redbull-fcm-level5-fix

Reason for revert: Build break, b/185169721
Reverted Changes:
Ie25de43fe:Moves the redfin FCM back down to level 5.
I83d3fcf54:Moves the redbull FCM back down to level 5.
Ib898e3c3f:Sets PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD to true.

Bug: 185169721
Change-Id: Ide48fa70fec55d3c97f8f37f4cc67563f5e8d312
---
 device-redfin.mk                    | 5 +----
 device_framework_matrix_product.xml | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/device-redfin.mk b/device-redfin.mk
index d19f0d2..69e6f88 100644
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -238,8 +238,5 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     renderthread.skia.reduceopstasksplitting=true
 
-# Include the redfin product FCM.
-# Vendor Freeze system-only builds use a different FCM.
-ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true)
+# Include the redfin product FCM
 PRODUCT_PACKAGES += redfin_product_compatibility_matrix.xml
-endif
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 00df579..742d1ff 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,4 +1,4 @@
-<compatibility-matrix version="1.0" type="framework" level="5">
+<compatibility-matrix version="1.0" type="framework" level="6">
     <hal format="hidl" optional="false">
         <name>vendor.google.wireless_charger</name>
         <version>1.3</version>