commit 317b04a8465d918f7c248015e8d08ecbc568261d
author Maciej Żenczykowski <maze@google.com> Sat Sep 17 02:36:31 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 17 02:36:31 2022 +0000
tree 4d826944bd4a855ba5fe740a739817b94095cbf5
parent 91f389a7100bb30fc1e5e211f58d3a51e9fb8c92
parent f4913b132376dd364bd5fb5a263c97f1d5058b04

Merge "StatsMapKey.java - uid U32 -> S32" am: f4913b1323

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

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

service-t/src/com/android/server/net/StatsMapKey.java

diff --git a/service-t/src/com/android/server/net/StatsMapKey.java b/service-t/src/com/android/server/net/StatsMapKey.java
index a26fa5b..44269b3 100644
--- a/service-t/src/com/android/server/net/StatsMapKey.java
+++ b/service-t/src/com/android/server/net/StatsMapKey.java
@@ -24,8 +24,8 @@
  * Key for both stats maps.
  */
 public class StatsMapKey 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;
@@ -36,7 +36,7 @@
     @Field(order = 3, type = Type.S32)
     public final int ifaceIndex;
 
-    public StatsMapKey(final long uid, final long tag, final long counterSet,
+    public StatsMapKey(final int uid, final long tag, final long counterSet,
             final int ifaceIndex) {
         this.uid = uid;
         this.tag = tag;