From 63f791a1e93967dd29625006d8cd6afb74c8d0f2 Mon Sep 17 00:00:00 2001
From: Esteban Talavera <etalavera@google.com>
Date: Mon, 8 Aug 2016 15:38:01 +0100
Subject: [PATCH] Update OEM unlock summary string

Bug: 30661116
Bug: 29047618

Change-Id: I4f747e29c595453d9d0263ce7fc90d37b81aa251
---
 res/values/strings.xml                            |  2 ++
 src/com/android/settings/DevelopmentSettings.java | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 68691de66db..0f259d08021 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7747,6 +7747,8 @@
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked">Bootloader is already unlocked</string>
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity. [CHAR_LIMIT=60] -->
     <string name="oem_unlock_enable_disabled_summary_connectivity">Connect to the Internet first</string>
+    <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity or the device is locked by the carrier [CHAR_LIMIT=60] -->
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked">Connect to the Internet or contact your carrier</string>
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because this setting is unavailable on sim-locked devices. [CHAR_LIMIT=60] -->
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device">Unavailable on carrier-locked devices</string>
 
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index c988e310c82..dbcb2774485 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -2350,11 +2350,12 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
             } else if (isSimLockedDevice()) {
                 oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_sim_locked_device;
             } else if (!isOemUnlockAllowed()) {
-                // If the device isn't SIM-locked but OEM unlock is disabled by user restriction,
-                // this means the device hasn't been able to confirm whether SIM-lock or any other
-                // restrictions apply (or hasn't been able to apply such restrictions yet). Ask the
-                // user to connect to the internet in order to retrieve all restrictions.
-                oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_connectivity;
+                // If the device isn't SIM-locked but OEM unlock is disabled by the system via the
+                // user restriction, this means either some other carrier restriction is in place or
+                // the device hasn't been able to confirm which restrictions (SIM-lock or otherwise)
+                // apply.
+                oemUnlockSummary =
+                    R.string.oem_unlock_enable_disabled_summary_connectivity_or_locked;
             }
             mEnableOemUnlock.setSummary(getString(oemUnlockSummary));
         }