Merge "update gps sdk 147.20.23.568380" into udc-dev
diff --git a/audio/aidl.mk b/audio/aidl.mk
index ae64e13..172b63d 100644
--- a/audio/aidl.mk
+++ b/audio/aidl.mk
@@ -4,6 +4,17 @@
PRODUCT_PACKAGES += \
android.hardware.audio.service-aidl.aoc
+# AIDL software effects. These are the effects supporting in all projects.
+# For the project-specific effects, such as haptic generator, please add them
+# to makefile in the project's device folder.
+PRODUCT_PACKAGES += \
+ libvisualizeraidl \
+ libbundleaidl \
+ libreverbaidl \
+ libdynamicsprocessingaidl \
+ libloudnessenhanceraidl \
+ libdownmixaidl \
+
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/aidl
include device/google/gs-common/audio/common.mk
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/radio/sepolicy/dump_radio.te b/radio/sepolicy/dump_radio.te
index 146776c..7970f08 100644
--- a/radio/sepolicy/dump_radio.te
+++ b/radio/sepolicy/dump_radio.te
@@ -3,6 +3,8 @@
userdebug_or_eng(`
allow dump_radio radio_vendor_data_file:dir create_dir_perms;
allow dump_radio radio_vendor_data_file:file create_file_perms;
+ allow dump_radio tcpdump_vendor_data_file:dir r_dir_perms;
+ allow dump_radio tcpdump_vendor_data_file:file r_file_perms;
get_prop(dump_radio, vendor_rild_prop)
get_prop(dump_radio vendor_tcpdump_log_prop)
')
diff --git a/radio/sepolicy/file.te b/radio/sepolicy/file.te
new file mode 100644
index 0000000..02d0209
--- /dev/null
+++ b/radio/sepolicy/file.te
@@ -0,0 +1,6 @@
+# Data
+type tcpdump_vendor_data_file, file_type, data_file_type;
+
+userdebug_or_eng(`
+ typeattribute tcpdump_vendor_data_file mlstrustedobject;
+')
diff --git a/radio/sepolicy/file_contexts b/radio/sepolicy/file_contexts
index 558beb3..20d786c 100644
--- a/radio/sepolicy/file_contexts
+++ b/radio/sepolicy/file_contexts
@@ -1 +1,2 @@
/vendor/bin/dump/dump_radio u:object_r:dump_radio_exec:s0
+/data/vendor/tcpdump_logger(/.*)? u:object_r:tcpdump_vendor_data_file:s0
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;
diff --git a/storage/storage.mk b/storage/storage.mk
index 5542ac8..cd0556d 100644
--- a/storage/storage.mk
+++ b/storage/storage.mk
@@ -1,3 +1,8 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/storage/sepolicy
PRODUCT_PACKAGES += dump_storage.sh
+
+# Pixel storage tool
+PRODUCT_PACKAGES_DEBUG += \
+ sg_write_buffer \
+ sg_read_buffer
diff --git a/widevine/widevine.mk b/widevine/widevine.mk
new file mode 100644
index 0000000..c59c7b9
--- /dev/null
+++ b/widevine/widevine.mk
@@ -0,0 +1,4 @@
+PRODUCT_PACKAGES += \
+ android.hardware.drm-service.clearkey \
+
+-include vendor/widevine/libwvdrmengine/apex/device/device.mk
\ No newline at end of file