From e9be9eb08bb207f3e8d0c4acbdd3a760ce1ffaf8 Mon Sep 17 00:00:00 2001
From: Jiashen Wang <jiashenwang@google.com>
Date: Tue, 19 Jan 2021 15:42:17 -0800
Subject: [PATCH] Add a config flag to control slot change receiver in Settings

Bug: 153811431
Bug: 170508680
Test: Manually tested
Change-Id: I4a06eba0d9e10c1eb9638a570af49df33758dba6
---
 res/values/config.xml                                       | 3 +++
 .../settings/sim/receivers/SimSlotChangeReceiver.java       | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/res/values/config.xml b/res/values/config.xml
index d34c481e6f7..fd0063e557a 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -479,4 +479,7 @@
 
     <!-- Orders for overriding tile positions on the homepage -->
     <integer-array name="config_homepage_tile_orders"/>
+
+    <!-- Whether to handle slot change events -->
+    <bool name="config_handle_sim_slot_change">false</bool>
 </resources>
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
index 17a1b8d56cf..a730dd1b12c 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
@@ -27,6 +27,7 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.android.settings.R;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.List;
@@ -60,6 +61,11 @@ public class SimSlotChangeReceiver extends BroadcastReceiver {
 
     // Checks whether the slot event should be handled.
     private boolean shouldHandleSlotChange(Context context) {
+        if (!context.getResources().getBoolean(R.bool.config_handle_sim_slot_change)) {
+            Log.i(TAG, "The flag is off. Ignore slot changes.");
+            return false;
+        }
+
         final EuiccManager euiccManager = context.getSystemService(EuiccManager.class);
         if (euiccManager == null || !euiccManager.isEnabled()) {
             Log.i(TAG, "Ignore slot changes because EuiccManager is disabled.");