summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-11-12 18:43:54 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-11-12 18:43:54 +0000
commit1c09264ac926e92a86f6b77e798592ed1870edf0 (patch)
tree47e8ad89d0e3c2791cc7e283a8b5ef3ee90d51ab
parent9ae65cfa172ae7d41ed1ab66333f6df53b77ff95 (diff)
parent7218b18ca48a92b0fdb8ef3907c5ab575d0a3486 (diff)
downloadsunfish-android11-qpr1-d-s1-release.tar.gz
Merge cherrypicks of [13045621, 13045608, 13045392, 13045622, 13045623, 13045624, 13045638, 13045639, 13045640, 13045641, 13045642, 13045643, 13046336, 13046337, 13046338, 13045644, 13045758, 13045759, 13045761, 13045762, 13045763, 13045609, 13045610, 13045611, 13045612, 13045764, 13046417, 13045645, 13046456, 13045632, 13045646, 13046457, 13046458, 13046459, 13046460, 13046461, 13046420, 13046346, 13046421, 13046347, 13046422, 13046496, 13046349, 13046423, 13046424, 13046497, 13044632, 13046462, 13045613, 13045647, 13045347, 13045614, 13045615, 13046425, 13046357, 13046358, 13046516, 13046517, 13046518, 13045633, 13045634, 13045635, 13045648, 13046359, 13045649, 13046519, 13046520, 13046521, 13046427, 13046428, 13046429, 13046430, 13046431, 13046432, 13046433, 13046435, 13046536, 13046537, 13046538, 13046539, 13046540, 13046541, 13046543, 13045766, 13045767, 13045768, 13046556, 13046557, 13046558, 13046522, 13046523, 13046524, 13046525, 13046526, 13046091, 13046527, 13046528, 13046529, 13046530, 13046531, 13046532, 13046360, 13046361, 13046362, 13046559, 13046560, 13046353, 13046465, 13046544, 13046533, 13045769, 13046363, 13046466, 13046561, 13046562, 13046364, 13045652, 13046534, 13046563] into rvc-qpr1-d-releaseandroid-11.0.0_r24android11-qpr1-d-s1-release
Change-Id: I4044cdb3fe5729565c0df2a389a1c1f5107839ef
-rw-r--r--device.mk2
-rw-r--r--device_framework_matrix.xml2
-rw-r--r--manifest.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/device.mk b/device.mk
index 99820348..e7bb5119 100644
--- a/device.mk
+++ b/device.mk
@@ -880,7 +880,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER)
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=15
+ ro.vendor.build.svn=16
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
index 3ba39332..0a7c32c6 100644
--- a/device_framework_matrix.xml
+++ b/device_framework_matrix.xml
@@ -294,7 +294,7 @@
<hal format="hidl">
<name>vendor.qti.hardware.radio.qtiradio</name>
<transport>hwbinder</transport>
- <version>2.3</version>
+ <version>2.4</version>
<interface>
<name>IQtiRadio</name>
<instance>slot1</instance>
diff --git a/manifest.xml b/manifest.xml
index 2b6d4cce..0875fff3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -588,7 +588,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<hal format="hidl">
<name>vendor.qti.hardware.radio.qtiradio</name>
<transport>hwbinder</transport>
- <version>2.3</version>
+ <version>2.4</version>
<interface>
<name>IQtiRadio</name>
<instance>slot1</instance>