Merge "Use ParcelFileDescriptor implementation in libbinder" (00c5a119) · Commits · e / os / android_packages_apps_Bluetooth

jni/bluetooth_socket_manager.cc

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -57,8 +57,8 @@ Status BluetoothSocketManagerBinderServer::connectSocket(
	return Status::ok();		return Status::ok();
	}		}

	_aidl_return->reset(new ParcelFileDescriptor());		_aidl_return->reset(
	(*_aidl_return)->setFileDescriptor(socket_fd, true);		new ParcelFileDescriptor(android::base::unique_fd(socket_fd)));
	return Status::ok();		return Status::ok();
	}		}

	@@ -97,8 +97,8 @@ Status BluetoothSocketManagerBinderServer::createSocketChannel(
	return Status::ok();		return Status::ok();
	}		}

	_aidl_return->reset(new ParcelFileDescriptor());		_aidl_return->reset(
	(*_aidl_return)->setFileDescriptor(socket_fd, true);		new ParcelFileDescriptor(android::base::unique_fd(socket_fd)));
	return Status::ok();		return Status::ok();
	}		}