commit d9d7d4f9f34986f4aa20902bf8126f5aaa4697c0
author Treehugger Robot <treehugger-gerrit@google.com> Sat Sep 17 08:39:58 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 17 08:39:58 2022 +0000
tree 5b3f6e0fc054cabefe97334c23253914482104b1
parent f2b4803a1624eba4fbf09f390055e4c2a673ba04
parent b202c7a96b0d2e6e155e118cc7ada6bf3f26ad1b

Merge "CookieTagMapValue.java - uid U32 -> S32" am: b202c7a96b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2218532

Change-Id: Ibc322be897dfe5b57d27141dad9738fd9fbe2506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

common/src/com/android/net/module/util/bpf/CookieTagMapValue.java

diff --git a/common/src/com/android/net/module/util/bpf/CookieTagMapValue.java b/common/src/com/android/net/module/util/bpf/CookieTagMapValue.java
index e1a221f..3fbd6fc 100644
--- a/common/src/com/android/net/module/util/bpf/CookieTagMapValue.java
+++ b/common/src/com/android/net/module/util/bpf/CookieTagMapValue.java
@@ -24,13 +24,13 @@
  * Value for cookie tag map.
  */
 public class CookieTagMapValue extends Struct {
-    @Field(order = 0, type = Type.U32)
-    public final long uid;
+    @Field(order = 0, type = Type.S32)
+    public final int uid;
 
     @Field(order = 1, type = Type.U32)
     public final long tag;
 
-    public CookieTagMapValue(final long uid, final long tag) {
+    public CookieTagMapValue(final int uid, final long tag) {
         this.uid = uid;
         this.tag = tag;
     }