commit 3109262f814309b0c93464006ba29d6a53b3145b
author Andre Eisenbach <eisenbach@google.com> Thu Jun 04 18:56:42 2015 -0700
committer Andre Eisenbach <eisenbach@google.com> Thu Jun 04 18:56:42 2015 -0700
tree e985d3b6a1fe78adc8f380b5937b5cd79c94e7cf
parent 49422b5771ff5bc45f032f40000697e6fd1bd3b5

Fix merge error in BluetoothPhoneServiceImpl

Change-Id: I0a7a721eb510642858b3037af63c3bf271d9c7c0

src/com/android/server/telecom/BluetoothPhoneServiceImpl.java

diff --git a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
index 9f074a2..24fb067 100644
--- a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
+++ b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
@@ -184,18 +184,12 @@
                     }
                     if (TextUtils.isEmpty(address)) {
                         address = TelephonyManager.from(mContext).getLine1Number();
+                        if (address == null) address = "";
                     }
                     return address;
                 } finally {
                     Binder.restoreCallingIdentity(token);
                 }
-
-                if (TextUtils.isEmpty(address)) {
-                    address = TelephonyManager.from(mContext).getLine1Number();
-                    if (address == null) address = "";
-                }
-
-                return address;
             }
         }