commit 2a65d6a25d123782d640617a59aa597fb478632b
author Benjamin Schwartz <bsschwar@google.com> Thu Feb 04 20:45:16 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 04 20:45:16 2021 +0000
tree 5022d24520ed6deaf8835672dc3ce938c0105983
parent 5f53663116f44189664d6dbdd176681b63901ac4
parent 77e678ce596346df8622a0b783c802866466e5b7

Merge "power/stats: Rename readEnergyMeters to readEnergyMeter" into sc-dev

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index f125df2..8e44be0 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -517,7 +517,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.soundtrigger</name>
-        <version>2.0-3</version>
+        <version>2.3</version>
         <interface>
             <name>ISoundTriggerHw</name>
             <instance>default</instance>

drm/1.0/default/CryptoPlugin.cpp

diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp
index 2db3607..e6d4e84 100644
--- a/drm/1.0/default/CryptoPlugin.cpp
+++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -124,7 +124,11 @@
             return Void();
         }
 
-        if (source.offset + offset + source.size > sourceBase->getSize()) {
+        size_t totalSize = 0;
+        if (__builtin_add_overflow(source.offset, offset, &totalSize) ||
+            __builtin_add_overflow(totalSize, source.size, &totalSize) ||
+            totalSize > sourceBase->getSize()) {
+            android_errorWriteLog(0x534e4554, "176496160");
             _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
             return Void();
         }

radio/1.6/types.hal

diff --git a/radio/1.6/types.hal b/radio/1.6/types.hal
index a6de033..c02a43f 100644
--- a/radio/1.6/types.hal
+++ b/radio/1.6/types.hal
@@ -744,6 +744,14 @@
              */
             NrVopsInfo nrVopsInfo;
         } ngranInfo;
+
+        struct GeranRegistrationInfo {
+            /**
+             * True if the dual transfer mode is supported.
+             * Refer to 3GPP TS 44.108 section 3.4.25.3
+             */
+            bool dtmSupported;
+        } geranInfo;
     } accessTechnologySpecificInfo;
 };