Merge "avoid NullPointerException" into main (0c33bd4c) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/telephony/BluetoothInCallService.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -293,7 +293,8 @@ public class BluetoothInCallService extends InCallService {
	}		}

	public void onParentChanged(BluetoothCall call) {		public void onParentChanged(BluetoothCall call) {
	if (call.isExternalCall()) {		if (mCallInfo.isNullCall(call) \|\| call.isExternalCall()) {
			Log.w(TAG, "null call or external call");
	return;		return;
	}		}
	if (call.getParentId() != null) {		if (call.getParentId() != null) {
	@@ -314,7 +315,8 @@ public class BluetoothInCallService extends InCallService {
	}		}

	public void onChildrenChanged(BluetoothCall call, List<BluetoothCall> children) {		public void onChildrenChanged(BluetoothCall call, List<BluetoothCall> children) {
	if (call.isExternalCall()) {		if (mCallInfo.isNullCall(call) \|\| call.isExternalCall()) {
			Log.w(TAG, "null call or external call");
	return;		return;
	}		}
	if (call.getChildrenIds().size() == 1) {		if (call.getChildrenIds().size() == 1) {