From f1163c51d2b268ea810a450efd937e748b3ab988 Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Fri, 10 Sep 2021 16:22:14 -0700
Subject: [PATCH] Add a device overlay for radio off delay due to IMS
 deregistration

Adds a new device overlay that allows a device to tune how long it
should wait for IMS deregistration in response to APM off or power
off indication. If 0, the feature should be disabled.

Bug: 195304068
Test: atest FrameworksTelephonyTests:ServiceStateTrackerTest
Change-Id: Id7b16d75c512106b56cb49974570811679498a0b
Merged-In: Id7b16d75c512106b56cb49974570811679498a0b
---
 core/res/res/values/config.xml  | 5 +++++
 core/res/res/values/symbols.xml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 14d3147754822..ac1912143dd7c 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3026,6 +3026,11 @@
          and one pSIM) -->
     <integer name="config_num_physical_slots">1</integer>
 
+    <!-- When a radio power off request is received, we will delay completing the request until
+         either IMS moves to the deregistered state or the timeout defined by this configuration
+         elapses. If 0, this feature is disabled and we do not delay radio power off requests.-->
+    <integer name="config_delay_for_ims_dereg_millis">0</integer>
+
     <!--Thresholds for LTE dbm in status bar-->
     <integer-array translatable="false" name="config_lteDbmThresholds">
         <item>-140</item>    <!-- SIGNAL_STRENGTH_NONE_OR_UNKNOWN -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 2be5152ce2d94..aebad6afc042f 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -476,6 +476,7 @@
   <java-symbol type="string" name="config_deviceSpecificDevicePolicyManagerService" />
   <java-symbol type="string" name="config_deviceSpecificAudioService" />
   <java-symbol type="integer" name="config_num_physical_slots" />
+  <java-symbol type="integer" name="config_delay_for_ims_dereg_millis" />
   <java-symbol type="array" name="config_integrityRuleProviderPackages" />
   <java-symbol type="bool" name="config_useAssistantVolume" />
   <java-symbol type="string" name="config_bandwidthEstimateSource" />