commit 0537b27f0640696ff4061a259f22c1f848bd51ca
author Jean Chalard <jchalard@google.com> Fri Oct 14 05:28:30 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 14 05:28:30 2022 +0000
tree e6fe9b5e65e4c862d37e93856452cbf901f59f67
parent 6464967c4b2015100aa9b67a95cffe7ad27b5d9b
parent d96aff4f1b424c52ffb6a00078bbcdce98079fb3

Merge "Fix an infinite loop" am: d96aff4f1b

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

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

framework/src/android/net/NetworkCapabilities.java

diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java
index d0cbbe5..38fead5 100644
--- a/framework/src/android/net/NetworkCapabilities.java
+++ b/framework/src/android/net/NetworkCapabilities.java
@@ -2334,7 +2334,7 @@
                 }
                 sb.append(nameFetcher.nameOf(bitPos));
             }
-            bitMask >>= 1;
+            bitMask >>>= 1;
             ++bitPos;
         }
     }