From 96100cc0269251de11c99178db0754197d945b4e Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Fri, 19 Mar 2021 10:15:06 +0000
Subject: [PATCH] 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                        | 2 --
 framework/src/android/net/NetworkUtils.java | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/framework/Android.bp b/framework/Android.bp
index fdfb1086de..74cecdd351 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -35,7 +35,6 @@ java_library {
         ":framework-javastream-protos",
     ],
     apex_available: [
-        "//apex_available:platform",
         "com.android.tethering",
     ],
     jarjar_rules: "jarjar-rules-proto.txt",
@@ -125,7 +124,6 @@ java_sdk_library {
         "//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 16a49bcae7..2679b6218c 100644
--- a/framework/src/android/net/NetworkUtils.java
+++ b/framework/src/android/net/NetworkUtils.java
@@ -42,6 +42,9 @@ import java.util.TreeSet;
  * {@hide}
  */
 public class NetworkUtils {
+    static {
+        System.loadLibrary("framework-connectivity-jni");
+    }
 
     private static final String TAG = "NetworkUtils";