GMS测试BTSfail-CVE-2022-20451

描述：

项目需要过GMS兼容性测试，BTS这块我们环境没有，送检之后出现了一个BTS的Alert，这个是必须要解决的。下面的warning可以不考虑。

这个是patch问题，根据代理提供的pdf文件找到一个id:为A-235098883的补丁，但是我们已经合入了。 MTK提供的patch也是一样的代码。最后还是代理给了一个patch才解决浪费了一次机会。

lyz modify BTSfail-CVE-2022-20451

alps/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java		patch | blob | history
alps/vendor/mediatek/proprietary/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java		patch | blob | history
diff --git a/alps/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java b/alps/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java
index cd13a92..73cdd5b 100755 (executable)
--- a/alps/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java
+++ b/alps/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java
@@ -2097,7 +2097,7 @@ public class CallsManager extends Call.ListenerBase
                 && !phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_MULTI_USER)) {
             // Check if the phoneAccountHandle belongs to the current user
             if (phoneAccountHandle != null &&
-                    !phoneAccountHandle.getUserHandle().equals(mCurrentUserHandle)) {
+                    !phoneAccountHandle.getUserHandle().equals(call.getInitiatingUser())) {
                 phoneAccountHandle = null;
             }
         }
diff --git a/alps/vendor/mediatek/proprietary/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java b/alps/vendor/mediatek/proprietary/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java
index ded482e..5326573 100755 (executable)
--- a/alps/vendor/mediatek/proprietary/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java
+++ b/alps/vendor/mediatek/proprietary/packages/services/Telecomm/src/com/android/server/telecom/CallsManager.java
@@ -2283,7 +2283,7 @@ public class CallsManager extends Call.ListenerBase
                 && !phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_MULTI_USER)) {
             // Check if the phoneAccountHandle belongs to the current user
             if (phoneAccountHandle != null &&
-                    !phoneAccountHandle.getUserHandle().equals(mCurrentUserHandle)) {
+                    !phoneAccountHandle.getUserHandle().equals(call.getInitiatingUser())) {
                 phoneAccountHandle = null;
             }
         }