LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Load JNI in all classes that have native methods." am: af97e51c01 am: ceafffa6c0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21f1af4785d1ee540ba6dea8416c2538e60a9228
This commit is contained in:
Lorenzo Colitti
2021-02-12 05:49:17 +00:00
committed by Automerger Merge Worker
parent 55e1cc23c6 ceafffa6c0
commit 531fa9e0cc
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tethering/src/android/net/util/TetheringUtils.java
View File

@@ -36,6 +36,10 @@ import java.util.Objects;
* {@hide} * {@hide}
*/ */
public class TetheringUtils { public class TetheringUtils {
static {
System.loadLibrary("tetherutilsjni");
}
public static final byte[] ALL_NODES = new byte[] { public static final byte[] ALL_NODES = new byte[] {
(byte) 0xff, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 (byte) 0xff, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
}; };

4
Tethering/src/com/android/networkstack/tethering/BpfMap.java
View File

@@ -41,6 +41,10 @@ import java.util.function.BiConsumer;
* @param <V> the value of the map. * @param <V> the value of the map.
*/ */
public class BpfMap<K extends Struct, V extends Struct> implements AutoCloseable { public class BpfMap<K extends Struct, V extends Struct> implements AutoCloseable {
static {
System.loadLibrary("tetherutilsjni");
}
// Following definitions from kernel include/uapi/linux/bpf.h // Following definitions from kernel include/uapi/linux/bpf.h
public static final int BPF_F_RDWR = 0; public static final int BPF_F_RDWR = 0;
public static final int BPF_F_RDONLY = 1 << 3; public static final int BPF_F_RDONLY = 1 << 3;

1
Tethering/src/com/android/networkstack/tethering/TetheringService.java
View File

@@ -82,7 +82,6 @@ public class TetheringService extends Service {
*/ */
@VisibleForTesting @VisibleForTesting
public Tethering makeTethering(TetheringDependencies deps) { public Tethering makeTethering(TetheringDependencies deps) {
System.loadLibrary("tetherutilsjni");
return new Tethering(deps); return new Tethering(deps);
} }