From 20584bc7666f91e4f9c2c4f670a89438ff3b8160 Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Sat, 30 Oct 2021 23:35:24 -0400
Subject: [PATCH] g12: Comply with property isolation

* Stock has isolation enabled, and yet has these all in
  /vendor/build.prop? - eh, we can do it correctly.

Change-Id: I547277eae2f0eadf873670bc79778f3401f036ba
---
 BoardConfigCommon.mk |  1 +
 g12.mk               |  1 -
 product.prop         | 18 ++++++++++++++++++
 system.prop          |  2 ++
 vendor.prop          | 12 ------------
 5 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 system.prop

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a243db8..5a57c26 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -105,6 +105,7 @@ TARGET_BOARD_PLATFORM := amlogic
 
 ## Properties
 TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop
+TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
 TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
 
 ## Soong Namespace
diff --git a/g12.mk b/g12.mk
index aff22e3..2088dd4 100644
--- a/g12.mk
+++ b/g12.mk
@@ -79,7 +79,6 @@ PRODUCT_PACKAGES += \
     android.hardware.drm@1.3-service.clearkey
 
 ## fastbootd
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.fastbootd.available=true
 PRODUCT_PACKAGES += fastbootd
 
 ## File-system permissions
diff --git a/product.prop b/product.prop
index 562bfe2..4abdba3 100644
--- a/product.prop
+++ b/product.prop
@@ -14,6 +14,11 @@ ro.config.notification_sound=pixiedust.ogg
 ## Battery (Fake)
 ro.boot.fake_battery=42
 
+## Bluetooth
+atv.setup.bt_remote_pairing=true
+config.disable_bluetooth=false
+ro.boot.btmacaddr=22:22:ce:d2:ca:13
+
 ## Camera
 camera.disable_zsl_mode=1
 rw.camera.usb.faceback=true
@@ -23,5 +28,18 @@ debug.sf.disable_backpressure=1
 debug.sf.latch_unsignaled=1
 ro.sf.disable_triple_buffer=0
 
+## HDMI
+mbx.hdmiin.switchfull=false
+mbx.hdmiin.videolayer=false
+ro.sys.hdmiin.enable=true
+
 ## Identifiers
 ro.oem.key1=ATV00100020
+
+## Media
+libplayer.livets.softdemux=1
+libplayer.netts.recalcpts=1
+ro.media.camera_preview.maxsize=1920x1080
+ro.media.camera_preview.limitedrate=1920x1080x30,1280x720x30,640x480x30,320x240x28
+ro.media.camera_preview.usemjpeg=1
+ro.media.maxmem=629145600
diff --git a/system.prop b/system.prop
new file mode 100644
index 0000000..4f3fd78
--- /dev/null
+++ b/system.prop
@@ -0,0 +1,2 @@
+## fastbootd
+ro.fastbootd.available=true
\ No newline at end of file
diff --git a/vendor.prop b/vendor.prop
index 740979a..7db82fc 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -9,10 +9,7 @@ ro.config.media_vol_default=20
 ro.config.media_vol_steps=25
 
 ## Bluetooth
-atv.setup.bt_remote_pairing=true
-config.disable_bluetooth=false
 persist.bluetooth.bluetooth_audio_hal.disabled=false
-ro.boot.btmacaddr=22:22:ce:d2:ca:13
 ro.vendor.autoconnectbt.btclass=50c
 ro.vendor.autoconnectbt.isneed=false
 ro.vendor.autoconnectbt.macprefix=00:CD:FF
@@ -24,12 +21,9 @@ drm.service.enabled=1
 vendor.drm.service.enable=true
 
 ## HDMI
-mbx.hdmiin.switchfull=false
-mbx.hdmiin.videolayer=false
 persist.sys.hdmi.keep_awake=false
 persist.vendor.sys.cec.power_assist_standby=false
 ro.hdmi.device_type=4
-ro.sys.hdmiin.enable=true
 ro.vendor.hdmi.auto_otp=false
 ro.vendor.platform.has.mbxuimode=true
 ro.vendor.platform.has.realoutputmode=true
@@ -56,14 +50,8 @@ dalvik.vm.heapstartsize=8m
 dalvik.vm.heaptargetutilization=0.75
 
 ## Media
-libplayer.livets.softdemux=1
-libplayer.netts.recalcpts=1
 persist.sys.media.avsync=true
 persist.vendor.media.bootvideo=0050
-ro.media.camera_preview.maxsize=1920x1080
-ro.media.camera_preview.limitedrate=1920x1080x30,1280x720x30,640x480x30,320x240x28
-ro.media.camera_preview.usemjpeg=1
-ro.media.maxmem=629145600
 ro.vendor.media.support.ffmpeg.adec=false
 ro.vendor.platform.disable.audiorawout=false
 ro.vendor.platform.support.dolby=true
-- 
2.20.1