commit c9e16364dd5bf5e624a91a72db2e61da5c88240a
author Shawn Lee <syeonlee@google.com> Thu Dec 08 22:16:05 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 08 22:16:05 2022 +0000
tree e9617e4ecba1b3eb2d15ae830606ba89eb5bdcda
parent a1b9c803b093836a28a162c7f52f15c606a686cc
parent 8854ed3a1128a0cc8a619256267a6cb7c448ccfd

Merge "Fixes AOSP EmergencyDialer failing to occlude Keyguard" into tm-qpr-dev

src/com/android/services/telephony/TelephonyConnectionService.java

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 071376d..0be7ba2 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -1133,6 +1133,11 @@
                             "Invalid phone type",
                             phone.getPhoneId()));
         }
+        if (!Objects.equals(request.getAccountHandle(), accountHandle)) {
+            Log.i(this, "onCreateOutgoingConnection, update phoneAccountHandle, accountHandle = "
+                    + accountHandle);
+            connection.setPhoneAccountHandle(accountHandle);
+        }
         connection.setAddress(handle, PhoneConstants.PRESENTATION_ALLOWED);
         connection.setTelephonyConnectionInitializing();
         connection.setTelephonyVideoState(request.getVideoState());