Merge "Use connectivity APIs from framework-connectivity" into sc-dev
diff --git a/framework/Android.bp b/framework/Android.bp
index fdfb108..74cecdd 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -35,7 +35,6 @@
":framework-javastream-protos",
],
apex_available: [
- "//apex_available:platform",
"com.android.tethering",
],
jarjar_rules: "jarjar-rules-proto.txt",
@@ -125,7 +124,6 @@
"//packages/modules/Connectivity/Tethering/tests/unit",
],
apex_available: [
- "//apex_available:platform",
"com.android.tethering",
],
}
diff --git a/framework/src/android/net/NetworkUtils.java b/framework/src/android/net/NetworkUtils.java
index 16a49bc..2679b62 100644
--- a/framework/src/android/net/NetworkUtils.java
+++ b/framework/src/android/net/NetworkUtils.java
@@ -42,6 +42,9 @@
* {@hide}
*/
public class NetworkUtils {
+ static {
+ System.loadLibrary("framework-connectivity-jni");
+ }
private static final String TAG = "NetworkUtils";