Merge "[CS10]Remove the hidden API usage of BitUtils" (02d57fc2) · Commits · e / os / android_frameworks_base

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+12 −10

Original line number	Diff line number	Diff line
		@@ -34,9 +34,9 @@ import android.util.ArraySet;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.BitUtils;
		import com.android.internal.util.Preconditions;
		import com.android.net.module.util.CollectionUtils;
		import com.android.net.module.util.NetworkCapabilitiesUtils;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -610,7 +610,7 @@ public final class NetworkCapabilities implements Parcelable {
		*/
		@UnsupportedAppUsage
		public @NetCapability int[] getCapabilities() {
		return BitUtils.unpackBits(mNetworkCapabilities);
		return NetworkCapabilitiesUtils.unpackBits(mNetworkCapabilities);
		}

		/**
		@@ -620,7 +620,7 @@ public final class NetworkCapabilities implements Parcelable {
		* @hide
		*/
		public @NetCapability int[] getUnwantedCapabilities() {
		return BitUtils.unpackBits(mUnwantedNetworkCapabilities);
		return NetworkCapabilitiesUtils.unpackBits(mUnwantedNetworkCapabilities);
		}


		@@ -632,8 +632,8 @@ public final class NetworkCapabilities implements Parcelable {
		*/
		public void setCapabilities(@NetCapability int[] capabilities,
		@NetCapability int[] unwantedCapabilities) {
		mNetworkCapabilities = BitUtils.packBits(capabilities);
		mUnwantedNetworkCapabilities = BitUtils.packBits(unwantedCapabilities);
		mNetworkCapabilities = NetworkCapabilitiesUtils.packBits(capabilities);
		mUnwantedNetworkCapabilities = NetworkCapabilitiesUtils.packBits(unwantedCapabilities);
		}

		/**
		@@ -688,7 +688,7 @@ public final class NetworkCapabilities implements Parcelable {
		& NON_REQUESTABLE_CAPABILITIES;

		if (nonRequestable != 0) {
		return capabilityNameOf(BitUtils.unpackBits(nonRequestable)[0]);
		return capabilityNameOf(NetworkCapabilitiesUtils.unpackBits(nonRequestable)[0]);
		}
		if (mLinkUpBandwidthKbps != 0 \|\| mLinkDownBandwidthKbps != 0) return "link bandwidth";
		if (hasSignalStrength()) return "signalStrength";
		@@ -946,7 +946,7 @@ public final class NetworkCapabilities implements Parcelable {
		*/
		@SystemApi
		@NonNull public @Transport int[] getTransportTypes() {
		return BitUtils.unpackBits(mTransportTypes);
		return NetworkCapabilitiesUtils.unpackBits(mTransportTypes);
		}

		/**
		@@ -956,7 +956,7 @@ public final class NetworkCapabilities implements Parcelable {
		* @hide
		*/
		public void setTransportTypes(@Transport int[] transportTypes) {
		mTransportTypes = BitUtils.packBits(transportTypes);
		mTransportTypes = NetworkCapabilitiesUtils.packBits(transportTypes);
		}

		/**
		@@ -1721,8 +1721,10 @@ public final class NetworkCapabilities implements Parcelable {
		long oldImmutableCapabilities = this.mNetworkCapabilities & mask;
		long newImmutableCapabilities = that.mNetworkCapabilities & mask;
		if (oldImmutableCapabilities != newImmutableCapabilities) {
		String before = capabilityNamesOf(BitUtils.unpackBits(oldImmutableCapabilities));
		String after = capabilityNamesOf(BitUtils.unpackBits(newImmutableCapabilities));
		String before = capabilityNamesOf(NetworkCapabilitiesUtils.unpackBits(
		oldImmutableCapabilities));
		String after = capabilityNamesOf(NetworkCapabilitiesUtils.unpackBits(
		newImmutableCapabilities));
		joiner.add(String.format("immutable capabilities changed: %s -> %s", before, after));
		}

packages/Connectivity/framework/src/android/net/util/DnsUtils.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@ import android.system.ErrnoException;
		import android.system.Os;
		import android.util.Log;

		import com.android.internal.util.BitUtils;

		import libcore.io.IoUtils;

		import java.io.FileDescriptor;
		@@ -332,7 +330,7 @@ public class DnsUtils {
		if (srcByte[i] == dstByte[i]) {
		continue;
		}
		int x = BitUtils.uint8(srcByte[i]) ^ BitUtils.uint8(dstByte[i]);
		int x = (srcByte[i] & 0xff) ^ (dstByte[i] & 0xff);
		return i * CHAR_BIT + (Integer.numberOfLeadingZeros(x) - 24); // Java ints are 32 bits
		}
		return dstByte.length * CHAR_BIT;

services/core/java/com/android/server/ConnectivityService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -191,7 +191,6 @@ import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.app.IBatteryStats;
		import com.android.internal.util.AsyncChannel;
		import com.android.internal.util.BitUtils;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.LocationPermissionChecker;
		import com.android.internal.util.MessageUtils;
		@@ -200,6 +199,7 @@ import com.android.net.module.util.BaseNetdUnsolicitedEventListener;
		import com.android.net.module.util.CollectionUtils;
		import com.android.net.module.util.LinkPropertiesUtils.CompareOrUpdateResult;
		import com.android.net.module.util.LinkPropertiesUtils.CompareResult;
		import com.android.net.module.util.NetworkCapabilitiesUtils;
		import com.android.net.module.util.PermissionUtils;
		import com.android.server.am.BatteryStatsService;
		import com.android.server.connectivity.AutodestructReference;
		@@ -6496,7 +6496,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		@NonNull NetworkCapabilities agentCaps, @NonNull NetworkCapabilities newNc) {
		underlyingNetworks = underlyingNetworksOrDefault(
		agentCaps.getOwnerUid(), underlyingNetworks);
		long transportTypes = BitUtils.packBits(agentCaps.getTransportTypes());
		long transportTypes = NetworkCapabilitiesUtils.packBits(agentCaps.getTransportTypes());
		int downKbps = NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;
		int upKbps = NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;
		// metered if any underlying is metered, or originally declared metered by the agent.
		@@ -6546,7 +6546,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		suspended = false;
		}

		newNc.setTransportTypes(BitUtils.unpackBits(transportTypes));
		newNc.setTransportTypes(NetworkCapabilitiesUtils.unpackBits(transportTypes));
		newNc.setLinkDownstreamBandwidthKbps(downKbps);
		newNc.setLinkUpstreamBandwidthKbps(upKbps);
		newNc.setCapability(NET_CAPABILITY_NOT_METERED, !metered);