Merge "Use ParcelFileDescriptor implementation in libbinder" am: 00c5a11920 (1d237ab3) · Commits · e / os / android_packages_apps_Bluetooth

jni/bluetooth_socket_manager.cc

+4 −4

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

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

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

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