commit 2f0ffdb589411bc37d55a5073e2683d20cd82d39
author Maciej Żenczykowski <maze@google.com> Fri Sep 16 21:50:23 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Sat Sep 17 00:45:27 2022 +0000
tree e8b4bb1326055c7ededd78c9d5468e0b07ee057b
parent 6c1c6bb582a0e22619e9e90c690e0689648c4511

UidStatsMapKey.java - uid U32 -> S32

The kernel is actually not consistent in whether uids & gids
are signed or unsigned, and neither is our Java code, which
also commonly uses just 'int' for uid.  In practice values
greater or equal to 2**31 often don't quite work right.
For example icmp sockets are enabled via a sysctl that
takes a minimum and maximum gid - and these are signed int32s.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I28780b304f99ebfdc1e9c6383d3fb377d1b457e8

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

diff --git a/service-t/src/com/android/server/net/UidStatsMapKey.java b/service-t/src/com/android/server/net/UidStatsMapKey.java
index 2849f94..59025fd 100644
--- a/service-t/src/com/android/server/net/UidStatsMapKey.java
+++ b/service-t/src/com/android/server/net/UidStatsMapKey.java
@@ -24,10 +24,10 @@
  * Key for uid stats map.
  */
 public class UidStatsMapKey extends Struct {
-    @Field(order = 0, type = Type.U32)
-    public final long uid;
+    @Field(order = 0, type = Type.S32)
+    public final int uid;
 
-    public UidStatsMapKey(final long uid) {
+    public UidStatsMapKey(final int uid) {
         this.uid = uid;
     }
 }