commit e80d1cfd58936fced61f096c7ab57393c2d4de98
author Robin Lee <rgl@google.com> Fri Mar 17 13:18:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 17 13:18:06 2017 +0000
tree 191f0973c98b20754bf97b1afd3a8c5b84930af6
parent 4532572d2c815c7af2660dda9eee05eda09e31a1
parent de148c40d2b7d10d0f99726a62a7761ef2bf927d

Merge "Protect mtpd socket from VPN"
am: de148c40d2

Change-Id: I2696608a26b7390c57a54a31e28a44484b7ba7ae

Android.bp

diff --git a/Android.bp b/Android.bp
index 7af119f..b865eec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,6 +23,7 @@
         "libcrypto",
         "libcutils",
         "liblog",
+        "libnetd_client",
     ],
     cflags: ["-DANDROID_CHANGES"],
     init_rc: ["mtpd.rc"],

mtpd.c

diff --git a/mtpd.c b/mtpd.c
index c005567..ae0a1e6 100644
--- a/mtpd.c
+++ b/mtpd.c
@@ -35,6 +35,7 @@
 #endif
 
 #include "mtpd.h"
+#include "NetdClient.h"
 
 int the_socket = -1;
 
@@ -295,6 +296,10 @@
         exit(NETWORK_ERROR);
     }
 
+#ifdef ANDROID_CHANGES
+    protectFromVpn(the_socket);
+#endif
+
     fcntl(the_socket, F_SETFD, FD_CLOEXEC);
     log_print(INFO, "Connection established (socket = %d)", the_socket);
 }