diff options
author | Sreeram Ramachandran <sreeram@google.com> | 2014-07-11 17:37:32 -0700 |
---|---|---|
committer | Sreeram Ramachandran <sreeram@google.com> | 2014-07-11 17:45:53 -0700 |
commit | 8e6912423c3be3fc2f4bab8ac815f0dce075ded8 (patch) | |
tree | 663cec66b2cead18e0683ab749062d94a51188b8 /media | |
parent | bb37e1ce90fe46963512a8dfa5f2f9a974a2424f (diff) | |
download | frameworks_av-8e6912423c3be3fc2f4bab8ac815f0dce075ded8.zip frameworks_av-8e6912423c3be3fc2f4bab8ac815f0dce075ded8.tar.gz frameworks_av-8e6912423c3be3fc2f4bab8ac815f0dce075ded8.tar.bz2 |
Use a better and more direct API to mark a socket as if it were a user's.
Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/Android.mk | 4 | ||||
-rw-r--r-- | media/libstagefright/HTTPBase.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
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 |