diff options
author | Jeff Sharkey | 2012-05-02 21:37:27 -0500 |
---|---|---|
committer | Android (Google) Code Review | 2012-05-02 21:37:27 -0500 |
commit | 982fd17ac179787ca5f7a7ece03234629285850f (patch) | |
tree | 1d0f958e38a2248a8c35012ad3a1c3466e924229 | |
parent | 7e057eb0047819ee4d8af52d2747a7bf29b0cc56 (diff) | |
parent | e34b91719c031f273d43781e5d96363a10ab44bd (diff) | |
download | platform-system-core-982fd17ac179787ca5f7a7ece03234629285850f.tar.gz platform-system-core-982fd17ac179787ca5f7a7ece03234629285850f.tar.xz platform-system-core-982fd17ac179787ca5f7a7ece03234629285850f.zip |
Merge "Support full 32 bits for socket tags." into jb-dev
-rw-r--r-- | libcutils/qtaguid.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libcutils/qtaguid.c b/libcutils/qtaguid.c index 1c57774c0..5bb81761e 100644 --- a/libcutils/qtaguid.c +++ b/libcutils/qtaguid.c | |||
@@ -99,9 +99,7 @@ static int write_param(const char *param_path, const char *value) { | |||
99 | int qtaguid_tagSocket(int sockfd, int tag, uid_t uid) { | 99 | int qtaguid_tagSocket(int sockfd, int tag, uid_t uid) { |
100 | char lineBuf[CTRL_MAX_INPUT_LEN]; | 100 | char lineBuf[CTRL_MAX_INPUT_LEN]; |
101 | int res; | 101 | int res; |
102 | /* Doing java-land a favor, enforcing "long" */ | 102 | uint64_t kTag = ((uint64_t)tag << 32); |
103 | uint64_t kTag = ((uint64_t)tag << 32) & ~(1LLU<<63); | ||
104 | |||
105 | 103 | ||
106 | pthread_once(&resTrackInitDone, qtaguid_resTrack); | 104 | pthread_once(&resTrackInitDone, qtaguid_resTrack); |
107 | 105 | ||