summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2020-02-21 04:54:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-02-21 04:54:17 +0000
commit539f8d3aa6b5014c6772c96454e00623c0d82754 (patch)
tree88e84e8639bff57538ed6a7ee03d06dfbf5e6bc3
parentb6239b514a7bc67c09d24db77b552a830b2d0b0a (diff)
parent6117b5304f1212a0c3cd4f865e31677e58774dde (diff)
Merge "FrameworkFacade: Use new @SystemApi for start/stop supplicant"
-rw-r--r--service/Android.bp3
-rw-r--r--service/java/com/android/server/wifi/FrameworkFacade.java5
2 files changed, 3 insertions, 5 deletions
diff --git a/service/Android.bp b/service/Android.bp
index 9e4ac4aa5..b40be1382 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -96,8 +96,7 @@ java_library {
"netd_aidl_interface-V2-java",
"services.net",
"wifi-lite-protos",
- "wifi-nano-protos",
- "PlatformProperties",
+ "wifi-nano-protos"
],
}
diff --git a/service/java/com/android/server/wifi/FrameworkFacade.java b/service/java/com/android/server/wifi/FrameworkFacade.java
index 49d41c644..d244c3739 100644
--- a/service/java/com/android/server/wifi/FrameworkFacade.java
+++ b/service/java/com/android/server/wifi/FrameworkFacade.java
@@ -31,7 +31,6 @@ import android.net.Uri;
import android.net.ip.IpClientCallbacks;
import android.net.ip.IpClientUtil;
import android.provider.Settings;
-import android.sysprop.WifiProperties;
import android.telephony.CarrierConfigManager;
import android.widget.Toast;
@@ -210,14 +209,14 @@ public class FrameworkFacade {
* Starts supplicant
*/
public void startSupplicant() {
- WifiProperties.start_supplicant(true);
+ SupplicantManager.start();
}
/**
* Stops supplicant
*/
public void stopSupplicant() {
- WifiProperties.stop_supplicant(true);
+ SupplicantManager.stop();
}
/**