Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3109262f authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

Fix merge error in BluetoothPhoneServiceImpl 

Change-Id: I0a7a721eb510642858b3037af63c3bf271d9c7c0
parent 49422b57

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

+1 −7
Original line number Diff line number Diff line
@@ -184,18 +184,12 @@ public final class BluetoothPhoneServiceImpl { 
                    }

                    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;

            }

        }