From 200bd72898c96b9afdeb8cd48ad237e71bf31f8d Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Mon, 17 Jul 2023 22:52:03 +0000 Subject: [PATCH] NetworkCapabilities: convert ALL_VALID_CAPABILITIES to long ALL_VALID_CAPABILITIES should be a long, since there are now 35 NetworkCapabilities that are stored in a bitfield. This caused NetworkCapabilities to be lost during parceling. Bug: 291160389 Test: TH Change-Id: Ia021ba5fd2094fdaec87446c73de2037c920c4f1 --- framework/src/android/net/NetworkCapabilities.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java index 92e9599503..b1aef3eb34 100644 --- a/framework/src/android/net/NetworkCapabilities.java +++ b/framework/src/android/net/NetworkCapabilities.java @@ -693,11 +693,11 @@ public final class NetworkCapabilities implements Parcelable { 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; }