commit fa092f6afab41def4943bd6ec4031d16e2c23b71
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jul 18 16:58:13 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 18 16:58:13 2023 +0000
tree 65a1dbd5201b0852beff8daa97cdf4310fbb8aa0
parent 200bd72898c96b9afdeb8cd48ad237e71bf31f8d
parent e7da6fdff14c33909cfbfcd9c80e624b008b11e9

Merge "BpfNetMaps.java - add @Requires(T) to all native_ methods" into main

framework/src/android/net/NetworkCapabilities.java

diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java
index 92e9599..b1aef3e 100644
--- a/framework/src/android/net/NetworkCapabilities.java
+++ b/framework/src/android/net/NetworkCapabilities.java
@@ -693,11 +693,11 @@
     private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;
     private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_PRIORITIZE_BANDWIDTH;
 
-    private static final int ALL_VALID_CAPABILITIES;
+    private static final long ALL_VALID_CAPABILITIES;
     static {
-        int caps = 0;
+        long caps = 0;
         for (int i = MIN_NET_CAPABILITY; i <= MAX_NET_CAPABILITY; ++i) {
-            caps |= 1 << i;
+            caps |= 1L << i;
         }
         ALL_VALID_CAPABILITIES = caps;
     }