Merge "Allow of expectAvailableCallbacks when validation state is unknown."
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index ef80170..a311eb5 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -110,6 +110,7 @@
java_library {
name: "net-utils-device-common-bpf",
srcs: [
+ "device/com/android/net/module/util/BpfBitmap.java",
"device/com/android/net/module/util/BpfMap.java",
"device/com/android/net/module/util/HexDump.java",
"device/com/android/net/module/util/IBpfMap.java",
diff --git a/staticlibs/device/com/android/net/module/util/BpfBitmap.java b/staticlibs/device/com/android/net/module/util/BpfBitmap.java
new file mode 100644
index 0000000..0c8bb37
--- /dev/null
+++ b/staticlibs/device/com/android/net/module/util/BpfBitmap.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.net.module.util;
+
+import android.system.ErrnoException;
+
+import androidx.annotation.NonNull;
+
+ /**
+ *
+ * Generic bitmap class for use with BPF programs. Corresponds to a BpfMap
+ * array type with key->int and value->uint64_t defined in the bpf program.
+ *
+ */
+public class BpfBitmap {
+ private BpfMap<Struct.U32, Struct.S64> mBpfMap;
+
+ /**
+ * Create a BpfBitmap map wrapper with "path" of filesystem.
+ *
+ * @param path The path of the BPF map.
+ */
+ public BpfBitmap(@NonNull String path) throws ErrnoException {
+ mBpfMap = new BpfMap<Struct.U32, Struct.S64>(path, BpfMap.BPF_F_RDWR,
+ Struct.U32.class, Struct.S64.class);
+ }
+
+ /**
+ * Retrieves the value from BpfMap for the given key.
+ *
+ * @param key The key in the map corresponding to the value to return.
+ */
+ private long getBpfMapValue(Struct.U32 key) throws ErrnoException {
+ Struct.S64 curVal = mBpfMap.getValue(key);
+ if (curVal != null) {
+ return curVal.val;
+ } else {
+ return 0;
+ }
+ }
+
+ /**
+ * Retrieves the bit for the given index in the bitmap.
+ *
+ * @param index Position in bitmap.
+ */
+ public boolean get(int index) throws ErrnoException {
+ if (index < 0) return false;
+
+ Struct.U32 key = new Struct.U32(index >> 6);
+ return ((getBpfMapValue(key) >>> (index & 63)) & 1L) != 0;
+ }
+
+ /**
+ * Set the specified index in the bitmap.
+ *
+ * @param index Position to set in bitmap.
+ */
+ public void set(int index) throws ErrnoException {
+ set(index, true);
+ }
+
+ /**
+ * Unset the specified index in the bitmap.
+ *
+ * @param index Position to unset in bitmap.
+ */
+ public void unset(int index) throws ErrnoException {
+ set(index, false);
+ }
+
+ /**
+ * Change the specified index in the bitmap to set value.
+ *
+ * @param index Position to unset in bitmap.
+ * @param set Boolean indicating to set or unset index.
+ */
+ public void set(int index, boolean set) throws ErrnoException {
+ if (index < 0) throw new IllegalArgumentException("Index out of bounds.");
+
+ Struct.U32 key = new Struct.U32(index >> 6);
+ long mask = (1L << (index & 63));
+ long val = getBpfMapValue(key);
+ if (set) val |= mask; else val &= ~mask;
+ mBpfMap.updateEntry(key, new Struct.S64(val));
+ }
+
+ /**
+ * Clears the map. The map may already be empty.
+ *
+ * @throws ErrnoException if updating entry to 0 fails.
+ */
+ public void clear() throws ErrnoException {
+ mBpfMap.forEach((key, value) -> {
+ mBpfMap.updateEntry(key, new Struct.S64(0));
+ });
+ }
+
+ /**
+ * Checks if all bitmap values are 0.
+ */
+ public boolean isEmpty() throws ErrnoException {
+ Struct.U32 key = mBpfMap.getFirstKey();
+ while (key != null) {
+ if (getBpfMapValue(key) != 0) {
+ return false;
+ }
+ key = mBpfMap.getNextKey(key);
+ }
+ return true;
+ }
+}
diff --git a/staticlibs/device/com/android/net/module/util/BpfMap.java b/staticlibs/device/com/android/net/module/util/BpfMap.java
index b42c388..d171b11 100644
--- a/staticlibs/device/com/android/net/module/util/BpfMap.java
+++ b/staticlibs/device/com/android/net/module/util/BpfMap.java
@@ -250,7 +250,7 @@
* Otherwise, iteration will result in undefined behaviour.
*/
@Override
- public void forEach(BiConsumer<K, V> action) throws ErrnoException {
+ public void forEach(ThrowingBiConsumer<K, V> action) throws ErrnoException {
@Nullable K nextKey = getFirstKey();
while (nextKey != null) {
diff --git a/staticlibs/device/com/android/net/module/util/IBpfMap.java b/staticlibs/device/com/android/net/module/util/IBpfMap.java
index 708cf61..d43b22c 100644
--- a/staticlibs/device/com/android/net/module/util/IBpfMap.java
+++ b/staticlibs/device/com/android/net/module/util/IBpfMap.java
@@ -64,10 +64,14 @@
/** Retrieve a value from the map. */
V getValue(@NonNull K key) throws ErrnoException;
+ public interface ThrowingBiConsumer<T,U> {
+ void accept(T t, U u) throws ErrnoException;
+ }
+
/**
* Iterate through the map and handle each key -> value retrieved base on the given BiConsumer.
*/
- void forEach(BiConsumer<K, V> action) throws ErrnoException;
+ void forEach(ThrowingBiConsumer<K, V> action) throws ErrnoException;
/** Clears the map. */
void clear() throws ErrnoException;
diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp
index 1a1328f..642544a 100644
--- a/staticlibs/testutils/Android.bp
+++ b/staticlibs/testutils/Android.bp
@@ -32,7 +32,6 @@
],
static_libs: [
"androidx.test.ext.junit",
- "compatibility-device-util-axt",
"kotlin-reflect",
"libnanohttpd",
"net-tests-utils-host-device-common",
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/DumpTestUtils.java b/staticlibs/testutils/devicetests/com/android/testutils/DumpTestUtils.java
index f2ad1e2..d103748 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/DumpTestUtils.java
+++ b/staticlibs/testutils/devicetests/com/android/testutils/DumpTestUtils.java
@@ -16,7 +16,7 @@
package com.android.testutils;
-import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+import static com.android.testutils.TestPermissionUtil.runAsShell;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -70,8 +70,7 @@
final String what = "service '" + serviceName + "' with args: " + Arrays.toString(args);
try {
if (adoptPermission) {
- runWithShellPermissionIdentity(() -> ib.dump(pipe[1], args),
- android.Manifest.permission.DUMP);
+ runAsShell(android.Manifest.permission.DUMP, () -> ib.dump(pipe[1], args));
} else {
ib.dump(pipe[1], args);
}
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestBpfMap.java b/staticlibs/testutils/devicetests/com/android/testutils/TestBpfMap.java
index 5614a99..73bc3a9 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestBpfMap.java
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestBpfMap.java
@@ -21,6 +21,7 @@
import androidx.annotation.NonNull;
import com.android.net.module.util.BpfMap;
+import com.android.net.module.util.IBpfMap.ThrowingBiConsumer;
import com.android.net.module.util.Struct;
import java.util.HashMap;
@@ -28,7 +29,6 @@
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
-import java.util.function.BiConsumer;
/**
*
@@ -49,7 +49,7 @@
}
@Override
- public void forEach(BiConsumer<K, V> action) throws ErrnoException {
+ public void forEach(ThrowingBiConsumer<K, V> action) throws ErrnoException {
// TODO: consider using mocked #getFirstKey and #getNextKey to iterate. It helps to
// implement the entry deletion in the iteration if required.
for (Map.Entry<K, V> entry : mMap.entrySet()) {