commit 75c959e7184f49b6e72b2c2453bf918c0902da54
author Remi NGUYEN VAN <reminv@google.com> Fri Mar 19 10:15:06 2021 +0000
committer Remi NGUYEN VAN <reminv@google.com> Thu Mar 25 06:34:52 2021 +0000
tree 1d2205e03fdd77de0ab801ee81afb721091cb053
parent e7ca4a87ab3bc6c2b856354abc248d284454a9de

Use connectivity APIs from framework-connectivity

Instead of compiling framework-connectivity source into
frameworks-minus-apex, have the APIs loaded separately from
framework-connectivity.

Bug: 171540887
Test: device boots, has connectivity
Change-Id: I8f07ff2082c3de80821e121807e66a43a870de7b

framework/Android.bp

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",
     ],
 }

framework/src/android/net/NetworkUtils.java

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";