commit a47c8e58366e6b9fd1f8e4e0ad66d5cfd774a672
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 11 19:48:47 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 11 19:48:47 2018 +0000
tree a981d365f9270c70d8bc5c0d8e37bd5bebf7e2df
parent 00c5a11920ead8d478d74fe92ab8055cde2c6a78
parent a91add54aaee2c6e72afe0afb41715318e0d8157

Merge "A2DP: Don't suppress noisy intent while stopping A2dpService"

jni/bluetooth_socket_manager.cc

diff --git a/jni/bluetooth_socket_manager.cc b/jni/bluetooth_socket_manager.cc
index a63beed..50c06bb 100644
--- a/jni/bluetooth_socket_manager.cc
+++ b/jni/bluetooth_socket_manager.cc
@@ -57,8 +57,8 @@
     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 @@
     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();
 }