modules_Connectivity: Don't depend on LoS

Change-Id: I919a55a7228f644f05d2555a78e037f87acb4ec4

3 files changed, 5 insertions, 9 deletions

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 4cff456974..2c7b8686f5 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -48,7 +48,6 @@ java_defaults {
         "net-utils-device-common-netlink",
         "netd-client",
         "tetheringstatsprotos",
-        "org.lineageos.platform.lineagesettings",
     ],
     libs: [
         "framework-connectivity",
diff --git a/Tethering/src/com/android/networkstack/tethering/Tethering.java b/Tethering/src/com/android/networkstack/tethering/Tethering.java
index 81baa8e28c..586b292201 100644
--- a/Tethering/src/com/android/networkstack/tethering/Tethering.java
+++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java
@@ -162,8 +162,6 @@ import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import lineageos.providers.LineageSettings;
-
 /**
  *
  * This class holds much of the business logic to allow Android devices
@@ -462,8 +460,8 @@ public class Tethering {
                 mTetherMainSM.sendMessage(TetherMainSM.CMD_UPSTREAM_CHANGED);
             }
         };
-        mContext.getContentResolver().registerContentObserver(LineageSettings.Secure.getUriFor(
-                LineageSettings.Secure.TETHERING_ALLOW_VPN_UPSTREAMS), false, vpnSettingObserver);
+        mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.TETHERING_ALLOW_VPN_UPSTREAMS), false, vpnSettingObserver);
     }
 
     private class TetheringThreadExecutor implements Executor {
diff --git a/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java b/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java
index da9f8c941e..efc7db4817 100644
--- a/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java
+++ b/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java
@@ -38,6 +38,7 @@ import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
 import android.net.util.SharedLog;
 import android.os.Handler;
+import android.provider.Settings;
 import android.util.Log;
 import android.util.SparseIntArray;
 
@@ -55,8 +56,6 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-import lineageos.providers.LineageSettings;
-
 
 /**
  * A class to centralize all the network and link properties information
@@ -330,8 +329,8 @@ public class UpstreamNetworkMonitor {
     public UpstreamNetworkState getCurrentPreferredUpstream() {
         // Use VPN upstreams if hotspot settings allow.
         if (mVpnInternetNetwork != null &&
-                LineageSettings.Secure.getInt(mContext.getContentResolver(),
-                        LineageSettings.Secure.TETHERING_ALLOW_VPN_UPSTREAMS, 0) == 1) {
+                Settings.Secure.getInt(mContext.getContentResolver(),
+                        Settings.Secure.TETHERING_ALLOW_VPN_UPSTREAMS, 0) == 1) {
             return mNetworkMap.get(mVpnInternetNetwork);
         }
         final UpstreamNetworkState dfltState = (mDefaultInternetNetwork != null)