This is a partial cherrypick of ag/3005393

It just contains the fix to location permission granting for emergency
calls for the case where an emergency call is added to an existing call.

The other part of ag/3005393, to enable the feature will be done in
ag/3034149 as a config overlay.

Bug: 67104002
Test: manual
Change-Id: I8c4f308a30b32335718e5909748d3fc84eac7259
Merged-In: I12b1362749ee265557d007a989917339468e9b0d

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index cdda3875..58f489c4 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -756,6 +756,10 @@ public class InCallController extends CallsManagerListenerBase {
             // We are bound, and we are connected.
             adjustServiceBindingsForEmergency();
 
+            // This is in case an emergency call is added while there is an existing call.
+            mEmergencyCallHelper.maybeGrantTemporaryLocationPermission(call,
+                    mCallsManager.getCurrentUserHandle());
+
             Log.i(this, "onCallAdded: %s", call);
             // Track the call if we don't already know about it.
             addCall(call);
@@ -807,6 +811,8 @@ public class InCallController extends CallsManagerListenerBase {
                     // Check again to make sure there are no active calls.
                     if (mCallsManager.getCalls().isEmpty()) {
                         unbindFromServices();
+
+                        mEmergencyCallHelper.maybeRevokeTemporaryLocationPermission();
                     }
                 }
             }.prepare(), mTimeoutsAdapter.getCallRemoveUnbindInCallServicesDelay(