commit 6ea936b7f4381128b1e826a309b1385831a979bb
author Jeff Sharkey <jsharkey@android.com> Wed May 02 19:40:54 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 02 19:40:54 2012 -0700
tree 0b4d9c43e7c0a7d8d9ac6d76350b646978e3158d
parent 1bd260c726f7f2e583b39baea07b9d4f2e0c1e58
parent 8f1d4daffd46c122501d22dda864ce6f209657b1

am 8f1d4daf: am 982fd17a: Merge "Support full 32 bits for socket tags." into jb-dev

* commit '8f1d4daffd46c122501d22dda864ce6f209657b1':
  Support full 32 bits for socket tags.

libcutils/qtaguid.c

diff --git a/libcutils/qtaguid.c b/libcutils/qtaguid.c
index 1c57774..5bb8176 100644
--- a/libcutils/qtaguid.c
+++ b/libcutils/qtaguid.c
@@ -99,9 +99,7 @@
 int qtaguid_tagSocket(int sockfd, int tag, uid_t uid) {
     char lineBuf[CTRL_MAX_INPUT_LEN];
     int res;
-    /* Doing java-land a favor, enforcing "long" */
-    uint64_t kTag = ((uint64_t)tag << 32) & ~(1LLU<<63);
-
+    uint64_t kTag = ((uint64_t)tag << 32);
 
     pthread_once(&resTrackInitDone, qtaguid_resTrack);