Merge "Remove getLine1AlphaTag() in Bluetooth code" (ae4b0415) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/map/BluetoothMapContent.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -2190,7 +2190,6 @@ public class BluetoothMapContent {
		if (tm != null) {
		fi.mPhoneType = tm.getPhoneType();
		fi.mPhoneNum = tm.getLine1Number();
		fi.mPhoneAlphaTag = tm.getLine1AlphaTag();
		}
		}

+1 −4

Original line number	Diff line number	Diff line
		@@ -1454,12 +1454,9 @@ public class BluetoothMapContentObserver {
		Context.TELEPHONY_SERVICE);
		if (tm != null) {
		phone = tm.getLine1Number();
		name = tm.getLine1AlphaTag();
		if (name == null \|\| name.isEmpty()) {
		name = phone;
		}
		}
		}
		String priority = "no"; // no priority for sms
		/* Incoming message from the network */
		if (mMapEventReportVersion

+1 −5

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import android.os.Message;
		import android.os.PowerManager;
		import android.os.UserManager;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.Log;

		import com.android.bluetooth.IObexConnectionHandler;
		@@ -785,11 +784,8 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect
		TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
		if (tm != null) {
		sLocalPhoneNum = tm.getLine1Number();
		sLocalPhoneName = tm.getLine1AlphaTag();
		if (TextUtils.isEmpty(sLocalPhoneName)) {
		sLocalPhoneName = this.getString(R.string.localPhoneName);
		}
		}
		if (VERBOSE)
		Log.v(TAG, "Local Phone Details- Number:" + sLocalPhoneNum
		+ ", Name:" + sLocalPhoneName);