From 8e6912423c3be3fc2f4bab8ac815f0dce075ded8 Mon Sep 17 00:00:00 2001
From: Sreeram Ramachandran <sreeram@google.com>
Date: Fri, 11 Jul 2014 17:37:32 -0700
Subject: Use a better and more direct API to mark a socket as if it were a
 user's.

Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
---
 media/libstagefright/Android.mk   | 4 ++--
 media/libstagefright/HTTPBase.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'media')

diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 99c8e9f..be9af5e 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -65,16 +65,15 @@ LOCAL_C_INCLUDES:= \
         $(TOP)/frameworks/av/include/media/stagefright/timedtext \
         $(TOP)/frameworks/native/include/media/hardware \
         $(TOP)/frameworks/native/include/media/openmax \
-        $(TOP)/frameworks/native/services/connectivitymanager \
         $(TOP)/external/flac/include \
         $(TOP)/external/tremolo \
         $(TOP)/external/openssl/include \
         $(TOP)/external/libvpx/libwebm \
+        $(TOP)/system/netd/include \
 
 LOCAL_SHARED_LIBRARIES := \
         libbinder \
         libcamera_client \
-        libconnectivitymanager \
         libcutils \
         libdl \
         libdrmframework \
@@ -84,6 +83,7 @@ LOCAL_SHARED_LIBRARIES := \
         libicuuc \
         liblog \
         libmedia \
+        libnetd_client \
         libopus \
         libsonivox \
         libssl \
diff --git a/media/libstagefright/HTTPBase.cpp b/media/libstagefright/HTTPBase.cpp
index ca68c3d..32291c8 100644
--- a/media/libstagefright/HTTPBase.cpp
+++ b/media/libstagefright/HTTPBase.cpp
@@ -26,7 +26,7 @@
 #include <cutils/properties.h>
 #include <cutils/qtaguid.h>
 
-#include <ConnectivityManager.h>
+#include <NetdClient.h>
 
 namespace android {
 
@@ -122,7 +122,7 @@ void HTTPBase::UnRegisterSocketUserTag(int sockfd) {
 
 // static
 void HTTPBase::RegisterSocketUserMark(int sockfd, uid_t uid) {
-    ConnectivityManager::markSocketAsUser(sockfd, uid);
+    setNetworkForUser(uid, sockfd);
 }
 
 // static
-- 
cgit v1.1