commit 495d7e1f6af536095cf90d7299b64e47c8323dfc
author Shishir Agrawal <shishir@google.com> Mon Dec 01 11:50:28 2014 -0800
committer Shishir Agrawal <shishir@google.com> Mon Dec 01 11:50:28 2014 -0800
tree 2aa87f4bada8d7f28ed3ad5e8a32c86b3e962d40
parent 3f51bf094a40e2a16fc4b4c14b5b52487507bd3d

TelephonyManager.setLine1NumberForDisplay should return a boolean.

The call can fail and should return the success status of the call.

Bug: 18571337
Change-Id: I610c9527b3ae3bd9e1eee5e442da3196c8f2487d

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index dc6bc1b..7366d44 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1979,27 +1979,30 @@
     }
 
     @Override
-    public void setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) {
+    public boolean setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) {
         enforceCarrierPrivilege();
 
         String iccId = getIccId(subId);
-        if (iccId != null) {
-            String alphaTagPrefKey = PREF_CARRIERS_ALPHATAG_PREFIX + iccId;
-            SharedPreferences.Editor editor = mTelephonySharedPreferences.edit();
-            if (alphaTag == null) {
-                editor.remove(alphaTagPrefKey);
-            } else {
-                editor.putString(alphaTagPrefKey, alphaTag);
-            }
-
-            String numberPrefKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
-            if (number == null) {
-                editor.remove(numberPrefKey);
-            } else {
-                editor.putString(numberPrefKey, number);
-            }
-            editor.commit();
+        if (TextUtils.isEmpty(iccId)) {
+            return false;
         }
+
+        String alphaTagPrefKey = PREF_CARRIERS_ALPHATAG_PREFIX + iccId;
+        SharedPreferences.Editor editor = mTelephonySharedPreferences.edit();
+        if (alphaTag == null) {
+            editor.remove(alphaTagPrefKey);
+        } else {
+            editor.putString(alphaTagPrefKey, alphaTag);
+        }
+
+        String numberPrefKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
+        if (number == null) {
+            editor.remove(numberPrefKey);
+        } else {
+            editor.putString(numberPrefKey, number);
+        }
+        editor.commit();
+        return true;
     }
 
     @Override