Merge "gs-common:aoc: correct aoc information in the bugreport" into udc-d1-dev
diff --git a/dauntless/sepolicy/fastbootd.te b/dauntless/sepolicy/fastbootd.te
new file mode 100644
index 0000000..c8c0e29
--- /dev/null
+++ b/dauntless/sepolicy/fastbootd.te
@@ -0,0 +1,3 @@
+recovery_only(`
+ allow fastbootd citadel_device:chr_file rw_file_perms;
+')
diff --git a/dauntless/sepolicy/recovery.te b/dauntless/sepolicy/recovery.te
new file mode 100644
index 0000000..c68244f
--- /dev/null
+++ b/dauntless/sepolicy/recovery.te
@@ -0,0 +1,3 @@
+recovery_only(`
+ allow recovery citadel_device:chr_file rw_file_perms;
+')
diff --git a/device.mk b/device.mk
index 2813186..f686621 100644
--- a/device.mk
+++ b/device.mk
@@ -23,3 +23,6 @@
# Installs gsi keys into ramdisk, to boot a developer GSI with verified boot.
$(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml
diff --git a/pixel_ril/ril.mk b/pixel_ril/ril.mk
index 03f7f24..37274aa 100644
--- a/pixel_ril/ril.mk
+++ b/pixel_ril/ril.mk
@@ -9,6 +9,10 @@
PRODUCT_PACKAGES += ril-extension
-PRODUCT_SOONG_NAMESPACES += vendor/google/tools/ril-extension-service
+PRODUCT_PACKAGES_DEBUG += libgooglerilmemmonitor
+
+PRODUCT_SOONG_NAMESPACES += \
+ vendor/google/tools/ril-extension-service \
+ vendor/google/tools/ril-mem-monitor
USE_GOOGLE_RIL_EXT := true
diff --git a/pixel_ril/sepolicy/rild.te b/pixel_ril/sepolicy/rild.te
index 3bb2cd7..55bffee 100644
--- a/pixel_ril/sepolicy/rild.te
+++ b/pixel_ril/sepolicy/rild.te
@@ -1,2 +1,7 @@
add_service(rild, hal_ril_ext_service)
binder_call(rild, rilextensionservice_app)
+
+# Allow rild to ptrace for memory leak detection
+userdebug_or_eng(`
+allow rild self:process ptrace;
+')
diff --git a/storage/sepolicy/fastbootd.te b/storage/sepolicy/fastbootd.te
new file mode 100644
index 0000000..35bac15
--- /dev/null
+++ b/storage/sepolicy/fastbootd.te
@@ -0,0 +1 @@
+allow fastbootd devpts:chr_file rw_file_perms;