summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorPaul Hu <paulhu@google.com>2021-03-17 14:57:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-03-17 14:57:32 +0000
commitef226d7a44cf84f61d002f2086f49027a25a5c4f (patch)
treee91f95a170de531a924ddeffff4e77109cd2a9bc /services
parent5dad6d6e5b60a9a3ddae4900bbf3a31ceca95779 (diff)
parentf6f331d56b8d2041fcb68761cca910cf445d12a8 (diff)
Merge "Add ConnectivitySettingsManager"
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index d99da057c34d..3194bdcaad18 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -106,6 +106,7 @@ import android.net.ConnectivityDiagnosticsManager.ConnectivityReport;
import android.net.ConnectivityDiagnosticsManager.DataStallReport;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
+import android.net.ConnectivitySettingsManager;
import android.net.DataStallReportParcelable;
import android.net.DnsResolverServiceManager;
import android.net.ICaptivePortal;
@@ -8244,7 +8245,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
Settings.Global.putString(mContext.getContentResolver(),
- Settings.Global.NETWORK_AVOID_BAD_WIFI, null);
+ ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI, null);
}
@Override