Merge "Call Forward Setting preference is disabled when setting an empty number" am: 9ef702e8d3 am: 6efd47d473

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2461895

Change-Id: I28ece20b45535136c98300f5f445f237ef80ecf9
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/src/com/android/phone/TimeConsumingPreferenceActivity.java b/src/com/android/phone/TimeConsumingPreferenceActivity.java
index d21f6a8..1fe548c 100644
--- a/src/com/android/phone/TimeConsumingPreferenceActivity.java
+++ b/src/com/android/phone/TimeConsumingPreferenceActivity.java
@@ -192,7 +192,12 @@
         if (mIsForeground) {
             showDialog(error);
         }
-        preference.setEnabled(false);
+
+        //If the error is due to RESPONSE_ERROR, do not disable the item so end user
+        //can continue to interact with it.
+        if (error != RESPONSE_ERROR) {
+            preference.setEnabled(false);
+        }
     }
 
     @Override