From c676225fef8fa0ac27fae9fe45492db54038d865 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Wed, 23 Mar 2022 11:09:28 +0800
Subject: [PATCH] enforce debugfs constraint on user build

Bug: 225815474
Test: build pass
Change-Id: I6507e784b3597220920f59d969bbeafdd199174b
---
 device.mk         | 3 ---
 factory_common.mk | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device.mk b/device.mk
index deffaae0..2a00b44b 100644
--- a/device.mk
+++ b/device.mk
@@ -230,9 +230,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay
 # This will be updated to 33 (Android T) for shipping
 PRODUCT_SHIPPING_API_LEVEL := 32
 
-# Temporarily disable the debugfs restriction on 31 (Android S)
-PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
-
 # Enforce the Product interface
 PRODUCT_PRODUCT_VNDK_VERSION := current
 PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
diff --git a/factory_common.mk b/factory_common.mk
index 4a5d42bd..fc745873 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -57,6 +57,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_f
 BOARD_BOOTCONFIG += androidboot.selinux=permissive
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
+# Disable DebugFS restrictions in factory builds
+PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
+
 # Disable Bluetooth as default in factory build
 DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory