Merge aosp tag 'android-9.0.0_r33' into lineage-16.0

February 2019 PQ2A.190205.003

  c7e536e DO NOT MERGE - Add vendor.qti.* libraries
  716d494 [DO NOT MERGE]Allow stats_companion to register thermal throttling event listener.
  2744eea OWNERS: Add nnk and remove dcashman
  2753987 Changing SUPL_ES=1 for SUPL end point control

7 files changed, 11 insertions, 1 deletions

diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index fc164dc5..11c91abd 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -20,5 +20,7 @@
             system/lib/libminui.so \
             system/xbin/iperf3 \
             system/xbin/sanitizer-status \
+            system/lib64/vendor.qti.atcmdfwd@1.0.so \
+            system/lib64/vendor.qti.qcril.am@1.0.so \
             "
     ;;
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 9d14348a..0d546641 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -34,4 +34,6 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/marlin/proprietary/libminui.so:system/lib/libminui.so:qcom \
     vendor/qcom/marlin/proprietary/iperf3:system/xbin/iperf3:qcom \
     vendor/qcom/marlin/proprietary/sanitizer-status:system/xbin/sanitizer-status:qcom \
+    vendor/qcom/marlin/proprietary/lib64/vendor.qti.atcmdfwd@1.0.so:system/lib64/vendor.qti.atcmdfwd@1.0.so:qcom \
+    vendor/qcom/marlin/proprietary/lib64/vendor.qti.qcril.am@1.0.so:system/lib64/vendor.qti.qcril.am@1.0.so:qcom \
 
diff --git a/self-extractors_sailfish/extract-lists.txt b/self-extractors_sailfish/extract-lists.txt
index fc164dc5..11c91abd 100644
--- a/self-extractors_sailfish/extract-lists.txt
+++ b/self-extractors_sailfish/extract-lists.txt
@@ -20,5 +20,7 @@
             system/lib/libminui.so \
             system/xbin/iperf3 \
             system/xbin/sanitizer-status \
+            system/lib64/vendor.qti.atcmdfwd@1.0.so \
+            system/lib64/vendor.qti.qcril.am@1.0.so \
             "
     ;;
diff --git a/self-extractors_sailfish/qcom/staging/device-partial.mk b/self-extractors_sailfish/qcom/staging/device-partial.mk
index 98b6a72d..19e9f6af 100644
--- a/self-extractors_sailfish/qcom/staging/device-partial.mk
+++ b/self-extractors_sailfish/qcom/staging/device-partial.mk
@@ -34,4 +34,6 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/sailfish/proprietary/libminui.so:system/lib/libminui.so:qcom \
     vendor/qcom/sailfish/proprietary/iperf3:system/xbin/iperf3:qcom \
     vendor/qcom/sailfish/proprietary/sanitizer-status:system/xbin/sanitizer-status:qcom \
+    vendor/qcom/sailfish/proprietary/lib64/vendor.qti.atcmdfwd@1.0.so:system/lib64/vendor.qti.atcmdfwd@1.0.so:qcom \
+    vendor/qcom/sailfish/proprietary/lib64/vendor.qti.qcril.am@1.0.so:system/lib64/vendor.qti.qcril.am@1.0.so:qcom \
 
diff --git a/sepolicy/OWNERS b/sepolicy/OWNERS
index 9d3f1b17..e6fbbd47 100644
--- a/sepolicy/OWNERS
+++ b/sepolicy/OWNERS
@@ -1,9 +1,9 @@
 alanstokes@google.com
 bowgotsai@google.com
-dcashman@google.com
 jbires@google.com
 jeffv@google.com
 jgalenson@google.com
+nnk@google.com
 sspatil@google.com
 tomcherry@google.com
 trong@google.com
diff --git a/sepolicy/private/system_server.te b/sepolicy/private/system_server.te
new file mode 100644
index 00000000..581723eb
--- /dev/null
+++ b/sepolicy/private/system_server.te
@@ -0,0 +1 @@
+allow system_server thermal_service:service_manager find;
diff --git a/sepolicy/public/thermalserviced.te b/sepolicy/public/thermalserviced.te
new file mode 100644
index 00000000..aa6a0857
--- /dev/null
+++ b/sepolicy/public/thermalserviced.te
@@ -0,0 +1 @@
+binder_call(thermalserviced, system_server)