From 15f983296e1e47da8f6af9cc739012613629da88 Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Tue, 25 Jun 2019 16:37:56 -0700
Subject: [PATCH] Replace old no-service resource with new one

The new no-service resource is a list of countries which use the "no
service" message by default instead of "emergency calls only." This
allows us to customize the config even when no SIM is present.

Bug: 126651774
Test: atest ServiceStateTrackerTest
Change-Id: I6bf57c61c2b0fbce9d2bae8c3f3870ae1aa716de
---
 core/res/res/values/config.xml  | 8 +++++---
 core/res/res/values/symbols.xml | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index f96116c002345..740aad7e34ffc 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3783,9 +3783,11 @@
     <integer name="config_stableDeviceDisplayWidth">-1</integer>
     <integer name="config_stableDeviceDisplayHeight">-1</integer>
 
-    <!-- Decide whether to display 'No service' on status bar instead of 'Emergency calls only'
-         when SIM is unready. -->
-    <bool name="config_display_no_service_when_sim_unready">false</bool>
+    <!-- List of countries in which we display 'No service' on status bar
+         instead of 'Emergency calls only' when SIM is unready. -->
+    <string-array translatable="false" name="config_display_no_service_when_sim_unready">
+        <item>"DE"</item>
+    </string-array>
 
     <!-- Class names of device specific services inheriting com.android.server.SystemService. The
          classes are instantiated in the order of the array. -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 9ebc7ab20f68e..7a9decb22cc2a 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3551,7 +3551,7 @@
 
   <java-symbol type="integer" name="config_stableDeviceDisplayWidth" />
   <java-symbol type="integer" name="config_stableDeviceDisplayHeight" />
-  <java-symbol type="bool" name="config_display_no_service_when_sim_unready" />
+  <java-symbol type="array" name="config_display_no_service_when_sim_unready" />
 
   <java-symbol type="layout" name="slice_grid" />
   <java-symbol type="layout" name="slice_message_local" />