HalDeviceManager: Add log to debug onSubsystemRestart am: 9ecef70cb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/15987848
Change-Id: I5abff7ded19dcf8d52d2dbf68de99f0da2027bc3
diff --git a/framework/Android.bp b/framework/Android.bp
index 5ca6c1a..0730f28 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -67,6 +67,24 @@
"//external/sl4a:__subpackages__",
]
+java_library {
+ name: "wifi-modules-utils",
+ sdk_version: "module_current",
+ min_sdk_version: "30",
+ static_libs: [
+ "modules-utils-build",
+ "modules-utils-handlerexecutor",
+ "modules-utils-list-slice",
+ "modules-utils-preconditions",
+ "modules-utils-shell-command-handler",
+ "modules-utils-statemachine",
+ ],
+ apex_available: [
+ "com.android.wifi",
+ "test_com.android.wifi",
+ ],
+}
+
// defaults shared between `framework-wifi` & `framework-wifi-pre-jarjar`
// java_sdk_library `framework-wifi` needs sources to generate stubs, so it cannot reuse
// `framework-wifi-pre-jarjar`
@@ -76,9 +94,8 @@
static_libs: [
"framework-wifi-util-lib",
"android.hardware.wifi-V1.0-java-constants",
- "modules-utils-build",
- "modules-utils-os",
"androidx.annotation_annotation",
+ "wifi-modules-utils",
],
libs: [
"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
diff --git a/framework/jarjar-rules.txt b/framework/jarjar-rules.txt
index 2331c2f..a36b453 100644
--- a/framework/jarjar-rules.txt
+++ b/framework/jarjar-rules.txt
@@ -110,7 +110,6 @@
rule fi.iki.elonen.** com.android.wifi.x.@0
## used by both framework-wifi and service-wifi ##
-rule android.os.HandlerExecutor* com.android.wifi.x.@0
rule android.telephony.Annotation* com.android.wifi.x.@0
rule com.android.internal.util.AsyncChannel* com.android.wifi.x.@0
rule com.android.internal.util.AsyncService* com.android.wifi.x.@0
diff --git a/framework/java/android/net/wifi/WifiManager.java b/framework/java/android/net/wifi/WifiManager.java
index da17f56..df2aa51 100644
--- a/framework/java/android/net/wifi/WifiManager.java
+++ b/framework/java/android/net/wifi/WifiManager.java
@@ -50,7 +50,6 @@
import android.os.Binder;
import android.os.Build;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.IBinder;
import android.os.Looper;
import android.os.Parcel;
@@ -70,6 +69,7 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.HandlerExecutor;
import com.android.modules.utils.ParceledListSlice;
import com.android.modules.utils.build.SdkLevel;
diff --git a/framework/tests/Android.bp b/framework/tests/Android.bp
index 4679fc0..8d37006 100644
--- a/framework/tests/Android.bp
+++ b/framework/tests/Android.bp
@@ -41,7 +41,7 @@
"frameworks-base-testutils",
"guava",
"mockito-target-minus-junit4",
- "modules-utils-build",
+ "wifi-modules-utils",
"net-tests-utils",
"net-utils-framework-common",
"truth-prebuilt",
diff --git a/framework/tests/src/android/net/wifi/WifiManagerTest.java b/framework/tests/src/android/net/wifi/WifiManagerTest.java
index f5954d4..29a2fbe 100644
--- a/framework/tests/src/android/net/wifi/WifiManagerTest.java
+++ b/framework/tests/src/android/net/wifi/WifiManagerTest.java
@@ -106,7 +106,6 @@
import android.net.wifi.WifiUsabilityStatsEntry.RateStats;
import android.os.Build;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.connectivity.WifiActivityEnergyInfo;
@@ -115,6 +114,7 @@
import androidx.test.filters.SmallTest;
+import com.android.modules.utils.HandlerExecutor;
import com.android.modules.utils.build.SdkLevel;
import org.junit.Before;
diff --git a/service/ServiceWifiResources/res/values-as/strings.xml b/service/ServiceWifiResources/res/values-as/strings.xml
index 97a2884..dc6e1d6 100644
--- a/service/ServiceWifiResources/res/values-as/strings.xml
+++ b/service/ServiceWifiResources/res/values-as/strings.xml
@@ -63,7 +63,7 @@
<string name="wifi_p2p_frequency_conflict_message" product="default" msgid="2226863827636191980">"ফ\'নটো <xliff:g id="DEVICE_NAME">%1$s</xliff:g> লৈ সংযোগ হ\'লে ৱাই-ফাইৰ পৰা কিছু সময়ৰ বাবে সংযোগ স্বীকাৰ বিচ্ছিন্ন হ\'ব"</string>
<string name="dlg_ok" msgid="254496739491689405">"ঠিক আছে"</string>
<string name="wifi_cannot_connect_with_randomized_mac_title" msgid="2344570489693915253">"<xliff:g id="SSID">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰিব নোৱাৰি"</string>
- <string name="wifi_cannot_connect_with_randomized_mac_message" msgid="4834133226521813352">"গোপনীয়তাৰ ছেটিং সলনি কৰিবলৈ আৰু পুনৰ চেষ্টা কৰিবলৈ টিপক"</string>
+ <string name="wifi_cannot_connect_with_randomized_mac_message" msgid="4834133226521813352">"গোপনীয়তাৰ ছেটিংসমূহ সলনি কৰিবলৈ আৰু পুনৰ চেষ্টা কৰিবলৈ টিপক"</string>
<string name="wifi_disable_mac_randomization_dialog_title" msgid="2054540994993681606">"গোপনীয়তাৰ ছেটিংটো সলনি কৰিবনে?"</string>
<string name="wifi_disable_mac_randomization_dialog_message" msgid="8874064864332248988">"সংযোগ কৰিবলৈ <xliff:g id="SSID">%1$s</xliff:g>এ আপোনাৰ ডিভাইচৰ MAC ঠিকনাটো, এটা সুকীয়া চিনাক্তকাৰী ব্যৱহাৰ কৰিব লাগে। বৰ্তমান, এই নেটৱৰ্কটোৰ বাবে আপোনাৰ গোপনীয়তাৰ ছেটিঙে এটা যাদৃচ্ছিক চিনাক্তকাৰী ব্যৱহাৰ কৰে। \n\nএই সালসলনিয়ে নিকটৱৰ্তী ডিভাইচসমূহক আপোনাৰ ডিভাইচটোৰ অৱস্থান ট্ৰেক কৰাৰ অনুমতি দিব পাৰে।"</string>
<string name="wifi_disable_mac_randomization_dialog_confirm_text" msgid="6954419863076751626">"ছেটিংটো সলনি কৰক"</string>
diff --git a/service/ServiceWifiResources/res/values-da/strings.xml b/service/ServiceWifiResources/res/values-da/strings.xml
index 58f854a..c823271 100644
--- a/service/ServiceWifiResources/res/values-da/strings.xml
+++ b/service/ServiceWifiResources/res/values-da/strings.xml
@@ -32,11 +32,11 @@
<string name="wifi_suggestion_action_allow_app" msgid="7757859972144671588">"Tillad"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="4565857699629860726">"Nej tak"</string>
<string name="wifi_suggestion_imsi_privacy_title" msgid="8969261812845304079">"Opret forbindelse til <xliff:g id="CARRIERNAME">%s</xliff:g>-Wi-Fi"</string>
- <string name="wifi_suggestion_imsi_privacy_content" msgid="4266931269306079184">"Disse netværk kræver et SIM-id, der kan bruges til at spore enhedens lokation"</string>
+ <string name="wifi_suggestion_imsi_privacy_content" msgid="4266931269306079184">"Disse netværk kræver et SIM-id, der kan bruges til at spore enhedens placering"</string>
<string name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier" msgid="3888538126440442636">"Opret forbindelse"</string>
<string name="wifi_suggestion_action_disallow_imsi_privacy_exemption_carrier" msgid="3225397664735676024">"Opret ikke forbindelse"</string>
<string name="wifi_suggestion_imsi_privacy_exemption_confirmation_title" msgid="4407415300707014525">"Vil du bekræfte forbindelsen?"</string>
- <string name="wifi_suggestion_imsi_privacy_exemption_confirmation_content" msgid="9211241189147807136">"Hvis du opretter forbindelse, kan Wi-Fi-netværk fra <xliff:g id="CARRIERNAME">%s</xliff:g> få adgang til eller dele et unikt id, der er knyttet til dit SIM-kort. Derved kan din enheds lokation muligvis spores."</string>
+ <string name="wifi_suggestion_imsi_privacy_exemption_confirmation_content" msgid="9211241189147807136">"Hvis du opretter forbindelse, kan Wi-Fi-netværk fra <xliff:g id="CARRIERNAME">%s</xliff:g> få adgang til eller dele et unikt id, der er knyttet til dit SIM-kort. Derved kan din enheds placering muligvis spores."</string>
<string name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation" msgid="2168947026413431603">"Opret forbindelse"</string>
<string name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation" msgid="5156881939985876066">"Opret ikke forbindelse"</string>
<string name="wifi_wakeup_onboarding_title" msgid="3868826648004934540">"Wi‑Fi aktiveres automatisk"</string>
@@ -65,7 +65,7 @@
<string name="wifi_cannot_connect_with_randomized_mac_title" msgid="2344570489693915253">"Der kan ikke oprettes forbindelse til <xliff:g id="SSID">%1$s</xliff:g>"</string>
<string name="wifi_cannot_connect_with_randomized_mac_message" msgid="4834133226521813352">"Tryk for at ændre privatlivsindstillingerne, og prøv igen"</string>
<string name="wifi_disable_mac_randomization_dialog_title" msgid="2054540994993681606">"Vil du ændre privatlivsindstillingen?"</string>
- <string name="wifi_disable_mac_randomization_dialog_message" msgid="8874064864332248988">"<xliff:g id="SSID">%1$s</xliff:g> skal bruge din enheds MAC-adresse (som er et unikt id), for at oprette forbindelse. I øjeblikket bruges et tilfældigt id i henhold til dine privatlivsindstillinger for dette netværk. \n\nDenne ændring kan gøre det muligt for enheder i nærheden spore din enheds lokation."</string>
+ <string name="wifi_disable_mac_randomization_dialog_message" msgid="8874064864332248988">"<xliff:g id="SSID">%1$s</xliff:g> skal bruge din enheds MAC-adresse (som er et unikt id), for at oprette forbindelse. I øjeblikket bruges et tilfældigt id i henhold til dine privatlivsindstillinger for dette netværk. \n\nDenne ændring kan gøre det muligt for enheder i nærheden spore din enheds placering."</string>
<string name="wifi_disable_mac_randomization_dialog_confirm_text" msgid="6954419863076751626">"Skift indstilling"</string>
<string name="wifi_disable_mac_randomization_dialog_success" msgid="5849155828154391387">"Indstillingen blev opdateret. Prøv at oprette forbindelse igen."</string>
<string name="wifi_disable_mac_randomization_dialog_failure" msgid="2894643619143813096">"Privatlivsindstillingen kan ikke ændres"</string>
diff --git a/service/ServiceWifiResources/res/values-eu/strings.xml b/service/ServiceWifiResources/res/values-eu/strings.xml
index 719791f..e985031 100644
--- a/service/ServiceWifiResources/res/values-eu/strings.xml
+++ b/service/ServiceWifiResources/res/values-eu/strings.xml
@@ -29,7 +29,7 @@
<string name="notification_channel_network_available" msgid="8454366142428864948">"Sare bat erabilgarri dago"</string>
<string name="wifi_suggestion_title" msgid="2564179935989099139">"Iradokitako wifi-sareak baimendu nahi dituzu?"</string>
<string name="wifi_suggestion_content" msgid="6985149577828091835">"<xliff:g id="NAME">%s</xliff:g> aplikazioak sare batzuk iradoki ditu. Baliteke gailua automatikoki konektatzea."</string>
- <string name="wifi_suggestion_action_allow_app" msgid="7757859972144671588">"Eman baimena"</string>
+ <string name="wifi_suggestion_action_allow_app" msgid="7757859972144671588">"Baimendu"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="4565857699629860726">"Ez, eskerrik asko"</string>
<string name="wifi_suggestion_imsi_privacy_title" msgid="8969261812845304079">"<xliff:g id="CARRIERNAME">%s</xliff:g> operadorearen wifi-sarera konektatu nahi duzu?"</string>
<string name="wifi_suggestion_imsi_privacy_content" msgid="4266931269306079184">"Sare hauek SIM ID bat jasotzen dute, gailuaren kokapenaren jarraipena egin ahal izateko"</string>
diff --git a/service/ServiceWifiResources/res/values-in/strings.xml b/service/ServiceWifiResources/res/values-in/strings.xml
index 08d689c..e3c3a83 100644
--- a/service/ServiceWifiResources/res/values-in/strings.xml
+++ b/service/ServiceWifiResources/res/values-in/strings.xml
@@ -37,17 +37,17 @@
<string name="wifi_suggestion_action_disallow_imsi_privacy_exemption_carrier" msgid="3225397664735676024">"Jangan hubungkan"</string>
<string name="wifi_suggestion_imsi_privacy_exemption_confirmation_title" msgid="4407415300707014525">"Konfirmasi koneksi?"</string>
<string name="wifi_suggestion_imsi_privacy_exemption_confirmation_content" msgid="9211241189147807136">"Jika Anda menghubungkan, jaringan Wi-Fi <xliff:g id="CARRIERNAME">%s</xliff:g> mungkin mengakses atau membagikan ID unik terkait dengan SIM Anda. Ini memungkinkan lokasi perangkat Anda untuk dilacak."</string>
- <string name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation" msgid="2168947026413431603">"Hubungkan"</string>
+ <string name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation" msgid="2168947026413431603">"Ikuti"</string>
<string name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation" msgid="5156881939985876066">"Jangan hubungkan"</string>
<string name="wifi_wakeup_onboarding_title" msgid="3868826648004934540">"Wi‑Fi akan aktif otomatis"</string>
<string name="wifi_wakeup_onboarding_subtext" msgid="5705886295837387430">"Saat berada di dekat jaringan berkualitas tinggi yang tersimpan"</string>
<string name="wifi_wakeup_onboarding_action_disable" msgid="6209706680391785825">"Jangan aktifkan kembali"</string>
<string name="wifi_wakeup_enabled_title" msgid="5043486751612595850">"Wi‑Fi diaktifkan otomatis"</string>
<string name="wifi_wakeup_enabled_content" msgid="3911262526267025882">"Anda berada di dekat jaringan yang tersimpan: <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
- <string name="wifi_watchdog_network_disabled" msgid="5769226742956006362">"Tidak dapat terhubung ke Wi-Fi"</string>
+ <string name="wifi_watchdog_network_disabled" msgid="5769226742956006362">"Tidak dapat tersambung ke Wi-Fi"</string>
<string name="wifi_watchdog_network_disabled_detailed" msgid="1725243835135539125">" memiliki koneksi internet yang buruk."</string>
<string name="wifi_connect_alert_title" msgid="2368200646665663612">"Izinkan hubungan?"</string>
- <string name="wifi_connect_alert_message" msgid="7226456300982080746">"Aplikasi %1$s ingin terhubung ke Jaringan Wifi %2$s"</string>
+ <string name="wifi_connect_alert_message" msgid="7226456300982080746">"Aplikasi %1$s ingin tersambung ke Jaringan Wifi %2$s"</string>
<string name="wifi_connect_default_application" msgid="8917703737222707062">"Aplikasi"</string>
<string name="accept" msgid="8346431649376483879">"Terima"</string>
<string name="decline" msgid="4172251727603762084">"Tolak"</string>
@@ -58,9 +58,9 @@
<string name="wifi_p2p_to_message" msgid="3809923305696994787">"Kepada:"</string>
<string name="wifi_p2p_enter_pin_message" msgid="5200220251738047620">"Ketik PIN yang diminta:"</string>
<string name="wifi_p2p_show_pin_message" msgid="1000091690967930798">"PIN:"</string>
- <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="2875937871590955304">"Sambungan tablet akan diputuskan dari Wi-Fi untuk sementara saat terhubung dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="2875937871590955304">"Sambungan tablet akan diputuskan dari Wi-Fi untuk sementara saat tersambung dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="9133053225387001827">"Perangkat Android TV akan memutuskan hubungan sementara dari Wi-Fi saat terhubung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
- <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="2226863827636191980">"Ponsel akan terputus sementara dari Wi-Fi saat terhubung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="2226863827636191980">"Ponsel akan terputus sementara dari Wi-Fi saat tersambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="dlg_ok" msgid="254496739491689405">"Oke"</string>
<string name="wifi_cannot_connect_with_randomized_mac_title" msgid="2344570489693915253">"Tidak dapat terhubung ke <xliff:g id="SSID">%1$s</xliff:g>"</string>
<string name="wifi_cannot_connect_with_randomized_mac_message" msgid="4834133226521813352">"Ketuk untuk mengubah setelan privasi dan coba lagi"</string>
@@ -79,6 +79,6 @@
<string name="wifi_eap_error_message_code_32766" msgid="2335996367705677670">"<xliff:g id="SSID">%1$s</xliff:g> : Error autentikasi EAP 32766"</string>
<string name="wifi_softap_auto_shutdown_timeout_expired_title" msgid="4896534374569504484">"Hotspot dinonaktifkan"</string>
<string name="wifi_softap_auto_shutdown_timeout_expired_summary" msgid="7975476698140267728">"Tidak ada perangkat yang terhubung. Ketuk untuk mengubah."</string>
- <string name="wifi_sim_required_title" msgid="2262227800991155459">"Wi-Fi tidak terhubung"</string>
+ <string name="wifi_sim_required_title" msgid="2262227800991155459">"Wi-Fi tidak tersambung"</string>
<string name="wifi_sim_required_message" msgid="284812212346125745">"Untuk terhubung ke <xliff:g id="SSID">%1$s</xliff:g>, masukkan SIM <xliff:g id="CARRIER_NAME">%2$s</xliff:g>"</string>
</resources>
diff --git a/service/ServiceWifiResources/res/values-ky/strings.xml b/service/ServiceWifiResources/res/values-ky/strings.xml
index 00d0953..2c486b7 100644
--- a/service/ServiceWifiResources/res/values-ky/strings.xml
+++ b/service/ServiceWifiResources/res/values-ky/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifiResourcesAppLabel" product="default" msgid="3120115613525263696">"Системанын Wi-Fi ресурстары"</string>
+ <string name="wifiResourcesAppLabel" product="default" msgid="3120115613525263696">"Тутумдун Wi-Fi ресурстары"</string>
<string name="wifi_available_title" msgid="3899472737467127635">"Ачык Wi‑Fi тармагына туташуу"</string>
<string name="wifi_available_title_connecting" msgid="7233590022728579868">"Wi‑Fi тармагына туташууда"</string>
<string name="wifi_available_title_connected" msgid="6329493859989844201">"Ачык Wi‑Fi тармагына туташты"</string>
diff --git a/service/ServiceWifiResources/res/values-mcc310-mnc004-da/strings.xml b/service/ServiceWifiResources/res/values-mcc310-mnc004-da/strings.xml
index 8972969..42d9cf6 100644
--- a/service/ServiceWifiResources/res/values-mcc310-mnc004-da/strings.xml
+++ b/service/ServiceWifiResources/res/values-mcc310-mnc004-da/strings.xml
@@ -22,5 +22,5 @@
<string name="wifi_eap_error_message_code_32763" msgid="8051026304965697200">"<xliff:g id="SSID">%1$s</xliff:g> : Du har allerede oprettet forbindelse til Verizon Wi-Fi Access."</string>
<string name="wifi_eap_error_message_code_32764" msgid="7311904315070770780">"<xliff:g id="SSID">%1$s</xliff:g> : Du kan ikke oprette forbindelse til Verizon Wi-Fi Access. Ring til os på telefonnummer 800-922-0204."</string>
<string name="wifi_eap_error_message_code_32765" msgid="576968115890091383">"<xliff:g id="SSID">%1$s</xliff:g> : Der er et problem med din Verizon Wi-Fi Access-konto. Ring til os på telefonnummer 800-922-0204."</string>
- <string name="wifi_eap_error_message_code_32766" msgid="895346637290649533">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access er ikke tilgængeligt i dit område. Prøv igen senere eller fra en anden lokation."</string>
+ <string name="wifi_eap_error_message_code_32766" msgid="895346637290649533">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access er ikke tilgængeligt i dit område. Prøv igen senere eller fra en anden placering."</string>
</resources>
diff --git a/service/ServiceWifiResources/res/values-mcc310-mnc004-kk/strings.xml b/service/ServiceWifiResources/res/values-mcc310-mnc004-kk/strings.xml
index 6044ecc..0847cdf 100644
--- a/service/ServiceWifiResources/res/values-mcc310-mnc004-kk/strings.xml
+++ b/service/ServiceWifiResources/res/values-mcc310-mnc004-kk/strings.xml
@@ -18,9 +18,9 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="wifi_eap_error_message_code_32760" msgid="5711364720754353427">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қызметіне Verizon қызмет көрсету аясынан тыс жерден қосыла алмайсыз."</string>
<string name="wifi_eap_error_message_code_32761" msgid="7871615432524623339">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қызметіне жазылған жоқсыз. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
- <string name="wifi_eap_error_message_code_32762" msgid="2994908156286205343">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access аккаунтына қатысты мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
+ <string name="wifi_eap_error_message_code_32762" msgid="2994908156286205343">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access есептік жазбасына қатысты мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
<string name="wifi_eap_error_message_code_32763" msgid="8051026304965697200">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қызметіне әлдеқашан қосылғансыз."</string>
<string name="wifi_eap_error_message_code_32764" msgid="7311904315070770780">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қызметіне қосылу кезінде мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
- <string name="wifi_eap_error_message_code_32765" msgid="576968115890091383">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access аккаунтына қатысты мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
+ <string name="wifi_eap_error_message_code_32765" msgid="576968115890091383">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access есептік жазбасына қатысты мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
<string name="wifi_eap_error_message_code_32766" msgid="895346637290649533">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қазіргі орналасқан жеріңізде жұмыс істемейді. Әрекетті кейінірек немесе басқа жерден қайталап көріңіз."</string>
</resources>
diff --git a/service/ServiceWifiResources/res/values-mcc310-mnc004-sv/strings.xml b/service/ServiceWifiResources/res/values-mcc310-mnc004-sv/strings.xml
index 19f153d..52f41ac 100644
--- a/service/ServiceWifiResources/res/values-mcc310-mnc004-sv/strings.xml
+++ b/service/ServiceWifiResources/res/values-mcc310-mnc004-sv/strings.xml
@@ -16,11 +16,11 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifi_eap_error_message_code_32760" msgid="5711364720754353427">"<xliff:g id="SSID">%1$s</xliff:g> : Det går inte att ansluta till Verizon wifi Access om du befinner dig utanför Verizons täckningsområde."</string>
- <string name="wifi_eap_error_message_code_32761" msgid="7871615432524623339">"<xliff:g id="SSID">%1$s</xliff:g> : Du prenumererar inte på Verizon wifi Access. Ring oss på 800 922 0204."</string>
- <string name="wifi_eap_error_message_code_32762" msgid="2994908156286205343">"<xliff:g id="SSID">%1$s</xliff:g> : Ett fel har uppstått i Verizon wifi Access-kontot. Ring oss på 800 922 0204."</string>
- <string name="wifi_eap_error_message_code_32763" msgid="8051026304965697200">"<xliff:g id="SSID">%1$s</xliff:g> : Du är redan ansluten till Verizon wifi Access."</string>
- <string name="wifi_eap_error_message_code_32764" msgid="7311904315070770780">"<xliff:g id="SSID">%1$s</xliff:g> : Det gick inte att ansluta till Verizon wifi Access. Ring oss på 800 922 0204."</string>
- <string name="wifi_eap_error_message_code_32765" msgid="576968115890091383">"<xliff:g id="SSID">%1$s</xliff:g> : Ett fel har uppstått i Verizon wifi Access-kontot. Ring oss på 800 922 0204."</string>
- <string name="wifi_eap_error_message_code_32766" msgid="895346637290649533">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon wifi Access är inte tillgängligt där du befinner dig. Försök igen senare eller anslut från en annan plats."</string>
+ <string name="wifi_eap_error_message_code_32760" msgid="5711364720754353427">"<xliff:g id="SSID">%1$s</xliff:g> : Det går inte att ansluta till Verizon Wi-Fi Access om du befinner dig utanför Verizons täckningsområde."</string>
+ <string name="wifi_eap_error_message_code_32761" msgid="7871615432524623339">"<xliff:g id="SSID">%1$s</xliff:g> : Du prenumererar inte på Verizon Wi-Fi Access. Ring oss på 800 922 0204."</string>
+ <string name="wifi_eap_error_message_code_32762" msgid="2994908156286205343">"<xliff:g id="SSID">%1$s</xliff:g> : Ett fel har uppstått i Verizon Wi-Fi Access-kontot. Ring oss på 800 922 0204."</string>
+ <string name="wifi_eap_error_message_code_32763" msgid="8051026304965697200">"<xliff:g id="SSID">%1$s</xliff:g> : Du är redan ansluten till Verizon Wi-Fi Access."</string>
+ <string name="wifi_eap_error_message_code_32764" msgid="7311904315070770780">"<xliff:g id="SSID">%1$s</xliff:g> : Det gick inte att ansluta till Verizon Wi-Fi Access. Ring oss på 800 922 0204."</string>
+ <string name="wifi_eap_error_message_code_32765" msgid="576968115890091383">"<xliff:g id="SSID">%1$s</xliff:g> : Ett fel har uppstått i Verizon Wi-Fi Access-kontot. Ring oss på 800 922 0204."</string>
+ <string name="wifi_eap_error_message_code_32766" msgid="895346637290649533">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access är inte tillgängligt där du befinner dig. Försök igen senare eller anslut från en annan plats."</string>
</resources>
diff --git a/service/ServiceWifiResources/res/values-mcc311-mnc480-da/strings.xml b/service/ServiceWifiResources/res/values-mcc311-mnc480-da/strings.xml
index d7180f4..18a2e82 100644
--- a/service/ServiceWifiResources/res/values-mcc311-mnc480-da/strings.xml
+++ b/service/ServiceWifiResources/res/values-mcc311-mnc480-da/strings.xml
@@ -22,5 +22,5 @@
<string name="wifi_eap_error_message_code_32763" msgid="2668371888408710653">"<xliff:g id="SSID">%1$s</xliff:g> : Du har allerede oprettet forbindelse til Verizon Wi-Fi Access."</string>
<string name="wifi_eap_error_message_code_32764" msgid="4857239018269450670">"<xliff:g id="SSID">%1$s</xliff:g> : Du kan ikke oprette forbindelse til Verizon Wi-Fi Access. Ring til os på telefonnummer 800-922-0204."</string>
<string name="wifi_eap_error_message_code_32765" msgid="3223606535554861258">"<xliff:g id="SSID">%1$s</xliff:g> : Der er et problem med din Verizon Wi-Fi Access-konto. Ring til os på telefonnummer 800-922-0204."</string>
- <string name="wifi_eap_error_message_code_32766" msgid="2703925241673900110">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access er ikke tilgængeligt i dit område. Prøv igen senere eller fra en anden lokation."</string>
+ <string name="wifi_eap_error_message_code_32766" msgid="2703925241673900110">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access er ikke tilgængeligt i dit område. Prøv igen senere eller fra en anden placering."</string>
</resources>
diff --git a/service/ServiceWifiResources/res/values-mcc311-mnc480-kk/strings.xml b/service/ServiceWifiResources/res/values-mcc311-mnc480-kk/strings.xml
index f31d062..6e59481 100644
--- a/service/ServiceWifiResources/res/values-mcc311-mnc480-kk/strings.xml
+++ b/service/ServiceWifiResources/res/values-mcc311-mnc480-kk/strings.xml
@@ -18,9 +18,9 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="wifi_eap_error_message_code_32760" msgid="1073938428568671170">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қызметіне Verizon қызмет көрсету аясынан тыс жерден қосыла алмайсыз."</string>
<string name="wifi_eap_error_message_code_32761" msgid="5240496654119200117">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қызметіне жазылған жоқсыз. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
- <string name="wifi_eap_error_message_code_32762" msgid="1380081181230313771">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access аккаунтына қатысты мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
+ <string name="wifi_eap_error_message_code_32762" msgid="1380081181230313771">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access есептік жазбасына қатысты мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
<string name="wifi_eap_error_message_code_32763" msgid="2668371888408710653">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қызметіне әлдеқашан қосылғансыз."</string>
<string name="wifi_eap_error_message_code_32764" msgid="4857239018269450670">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қызметіне қосылу кезінде мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
- <string name="wifi_eap_error_message_code_32765" msgid="3223606535554861258">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access аккаунтына қатысты мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
+ <string name="wifi_eap_error_message_code_32765" msgid="3223606535554861258">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access есептік жазбасына қатысты мәселе шықты. Бізге 800-922-0204 нөмірі арқылы хабарласыңыз."</string>
<string name="wifi_eap_error_message_code_32766" msgid="2703925241673900110">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access қазіргі орналасқан жеріңізде жұмыс істемейді. Әрекетті кейінірек немесе басқа жерден қайталап көріңіз."</string>
</resources>
diff --git a/service/ServiceWifiResources/res/values-mcc311-mnc480-sv/strings.xml b/service/ServiceWifiResources/res/values-mcc311-mnc480-sv/strings.xml
index 0f4fa89..f113434 100644
--- a/service/ServiceWifiResources/res/values-mcc311-mnc480-sv/strings.xml
+++ b/service/ServiceWifiResources/res/values-mcc311-mnc480-sv/strings.xml
@@ -16,11 +16,11 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifi_eap_error_message_code_32760" msgid="1073938428568671170">"<xliff:g id="SSID">%1$s</xliff:g> : Det går inte att ansluta till Verizon wifi Access om du befinner dig utanför Verizons täckningsområde."</string>
- <string name="wifi_eap_error_message_code_32761" msgid="5240496654119200117">"<xliff:g id="SSID">%1$s</xliff:g> : Du prenumererar inte på Verizon wifi Access. Ring oss på 800 922 0204."</string>
- <string name="wifi_eap_error_message_code_32762" msgid="1380081181230313771">"<xliff:g id="SSID">%1$s</xliff:g> : Ett fel har uppstått i Verizon wifi Access-kontot. Ring oss på 800 922 0204."</string>
- <string name="wifi_eap_error_message_code_32763" msgid="2668371888408710653">"<xliff:g id="SSID">%1$s</xliff:g> : Du är redan ansluten till Verizon wifi Access."</string>
- <string name="wifi_eap_error_message_code_32764" msgid="4857239018269450670">"<xliff:g id="SSID">%1$s</xliff:g> : Det gick inte att ansluta till Verizon wifi Access. Ring oss på 800 922 0204."</string>
- <string name="wifi_eap_error_message_code_32765" msgid="3223606535554861258">"<xliff:g id="SSID">%1$s</xliff:g> : Ett fel har uppstått i Verizon wifi Access-kontot. Ring oss på 800 922 0204."</string>
- <string name="wifi_eap_error_message_code_32766" msgid="2703925241673900110">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon wifi Access är inte tillgängligt där du befinner dig. Försök igen senare eller anslut från en annan plats."</string>
+ <string name="wifi_eap_error_message_code_32760" msgid="1073938428568671170">"<xliff:g id="SSID">%1$s</xliff:g> : Det går inte att ansluta till Verizon Wi-Fi Access om du befinner dig utanför Verizons täckningsområde."</string>
+ <string name="wifi_eap_error_message_code_32761" msgid="5240496654119200117">"<xliff:g id="SSID">%1$s</xliff:g> : Du prenumererar inte på Verizon Wi-Fi Access. Ring oss på 800 922 0204."</string>
+ <string name="wifi_eap_error_message_code_32762" msgid="1380081181230313771">"<xliff:g id="SSID">%1$s</xliff:g> : Ett fel har uppstått i Verizon Wi-Fi Access-kontot. Ring oss på 800 922 0204."</string>
+ <string name="wifi_eap_error_message_code_32763" msgid="2668371888408710653">"<xliff:g id="SSID">%1$s</xliff:g> : Du är redan ansluten till Verizon Wi-Fi Access."</string>
+ <string name="wifi_eap_error_message_code_32764" msgid="4857239018269450670">"<xliff:g id="SSID">%1$s</xliff:g> : Det gick inte att ansluta till Verizon Wi-Fi Access. Ring oss på 800 922 0204."</string>
+ <string name="wifi_eap_error_message_code_32765" msgid="3223606535554861258">"<xliff:g id="SSID">%1$s</xliff:g> : Ett fel har uppstått i Verizon Wi-Fi Access-kontot. Ring oss på 800 922 0204."</string>
+ <string name="wifi_eap_error_message_code_32766" msgid="2703925241673900110">"<xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access är inte tillgängligt där du befinner dig. Försök igen senare eller anslut från en annan plats."</string>
</resources>
diff --git a/service/ServiceWifiResources/res/values-mn/strings.xml b/service/ServiceWifiResources/res/values-mn/strings.xml
index 096bcfc..c168472 100644
--- a/service/ServiceWifiResources/res/values-mn/strings.xml
+++ b/service/ServiceWifiResources/res/values-mn/strings.xml
@@ -56,8 +56,8 @@
<string name="wifi_p2p_invitation_to_connect_title" msgid="8917157937652519251">"Холбох урилга"</string>
<string name="wifi_p2p_from_message" msgid="5921308150192756898">"Хэнээс:"</string>
<string name="wifi_p2p_to_message" msgid="3809923305696994787">"Хэнд:"</string>
- <string name="wifi_p2p_enter_pin_message" msgid="5200220251738047620">"Шаардлагатай ПИН-г бичнэ үү:"</string>
- <string name="wifi_p2p_show_pin_message" msgid="1000091690967930798">"ПИН:"</string>
+ <string name="wifi_p2p_enter_pin_message" msgid="5200220251738047620">"Шаардлагатай PIN-г бичнэ үү:"</string>
+ <string name="wifi_p2p_show_pin_message" msgid="1000091690967930798">"PIN:"</string>
<string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="2875937871590955304">"Таблет <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тэй холбогдох үедээ түр зуур Wi-Fi-с салах болно."</string>
<string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="9133053225387001827">"Таны Android TV төхөөрөмж <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-д холбогдсон үед Wi-Fi-с түр хугацаанд сална"</string>
<string name="wifi_p2p_frequency_conflict_message" product="default" msgid="2226863827636191980">"Утас <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тай холбогдох үедээ түр зуур Wi-Fi-с салах болно."</string>
diff --git a/service/ServiceWifiResources/res/values-ne/strings.xml b/service/ServiceWifiResources/res/values-ne/strings.xml
index 62acf4c..82f4e2e 100644
--- a/service/ServiceWifiResources/res/values-ne/strings.xml
+++ b/service/ServiceWifiResources/res/values-ne/strings.xml
@@ -17,12 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="wifiResourcesAppLabel" product="default" msgid="3120115613525263696">"प्रणालीको Wi-Fi का स्रोतहरू"</string>
- <string name="wifi_available_title" msgid="3899472737467127635">"खुला Wi‑Fi नेटवर्कमा कनेक्ट गर्नुहोस्"</string>
+ <string name="wifi_available_title" msgid="3899472737467127635">"खुला Wi‑Fi नेटवर्कमा जडान गर्नुहोस्"</string>
<string name="wifi_available_title_connecting" msgid="7233590022728579868">"Wi‑Fi नेटवर्कमा जडान गर्दै"</string>
<string name="wifi_available_title_connected" msgid="6329493859989844201">"Wi‑Fi नेटवर्कमा जडान गरियो"</string>
<string name="wifi_available_title_failed_to_connect" msgid="4840833680513368639">"Wi‑Fi नेटवर्कमा जडान गर्न सकिएन"</string>
<string name="wifi_available_content_failed_to_connect" msgid="4330035988269701861">"सबै नेटवर्कहरू हेर्न ट्याप गर्नुहोस्"</string>
- <string name="wifi_available_action_connect" msgid="5636634933476946222">"कनेक्ट गर्नुहोस्"</string>
+ <string name="wifi_available_action_connect" msgid="5636634933476946222">"जडान गर्नुहोस्"</string>
<string name="wifi_available_action_all_networks" msgid="8491109932336522211">"सबै नेटवर्कहरू"</string>
<string name="notification_channel_network_status" msgid="1631786866932924838">"नेटवर्कको स्थिति"</string>
<string name="notification_channel_network_alerts" msgid="1391603215241200880">"नेटवर्कका अलर्टहरू"</string>
@@ -59,7 +59,7 @@
<string name="wifi_p2p_enter_pin_message" msgid="5200220251738047620">"आवश्यक PIN टाइप गर्नुहोस्:"</string>
<string name="wifi_p2p_show_pin_message" msgid="1000091690967930798">"PIN:"</string>
<string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="2875937871590955304">"यो <xliff:g id="DEVICE_NAME">%1$s</xliff:g>सँग जोडिएको बेला ट्याब्लेट अस्थायी रूपमा वाइ-फाइबाट विच्छेद गरिने छ।"</string>
- <string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="9133053225387001827">"तपाईंको Android टिभी यन्त्र <xliff:g id="DEVICE_NAME">%1$s</xliff:g> मा कनेक्ट भएको बेला यो केही समयका लागि Wi-Fi बाट विच्छेद हुने छ।"</string>
+ <string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="9133053225387001827">"तपाईंको Android टिभी यन्त्र <xliff:g id="DEVICE_NAME">%1$s</xliff:g> मा जोडिएको बेला यो केही समयका लागि Wi-Fi बाट विच्छेद हुने छ।"</string>
<string name="wifi_p2p_frequency_conflict_message" product="default" msgid="2226863827636191980">"जब यो <xliff:g id="DEVICE_NAME">%1$s</xliff:g> सँग जडित हुन्छ, फोन अस्थायी रूपमा वाइ-फाइबाट विच्छेद हुने छ"</string>
<string name="dlg_ok" msgid="254496739491689405">"ठिक छ"</string>
<string name="wifi_cannot_connect_with_randomized_mac_title" msgid="2344570489693915253">"<xliff:g id="SSID">%1$s</xliff:g> मा जडान गर्न सकिएन"</string>
diff --git a/service/ServiceWifiResources/res/values-or/strings.xml b/service/ServiceWifiResources/res/values-or/strings.xml
index 5122c23..e7f4c54 100644
--- a/service/ServiceWifiResources/res/values-or/strings.xml
+++ b/service/ServiceWifiResources/res/values-or/strings.xml
@@ -50,7 +50,7 @@
<string name="wifi_connect_alert_message" msgid="7226456300982080746">"ଆପ୍ଲିକେଶନ୍ %1$s %2$s ୱାଇ-ଫାଇ ନେଟୱର୍କକୁ ସଂଯୋଗ କରିବାକୁ ଚାହେଁ"</string>
<string name="wifi_connect_default_application" msgid="8917703737222707062">"ଏକ ଅନୁପ୍ରୟୋଗ"</string>
<string name="accept" msgid="8346431649376483879">"ଗ୍ରହଣ କରନ୍ତୁ"</string>
- <string name="decline" msgid="4172251727603762084">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string>
+ <string name="decline" msgid="4172251727603762084">"ପ୍ରତ୍ୟାଖ୍ୟାନ"</string>
<string name="ok" msgid="847575529546290102">"ଠିକ୍ ଅଛି"</string>
<string name="wifi_p2p_invitation_sent_title" msgid="6552639940428040869">"ନିମନ୍ତ୍ରଣ ପଠାଗଲା"</string>
<string name="wifi_p2p_invitation_to_connect_title" msgid="8917157937652519251">"ସଂଯୁକ୍ତ ହେବାକୁ ନିମନ୍ତ୍ରଣ"</string>
diff --git a/service/ServiceWifiResources/res/values-pa/strings.xml b/service/ServiceWifiResources/res/values-pa/strings.xml
index feae8ce..e095962 100644
--- a/service/ServiceWifiResources/res/values-pa/strings.xml
+++ b/service/ServiceWifiResources/res/values-pa/strings.xml
@@ -61,7 +61,7 @@
<string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="2875937871590955304">"ਟੈਬਲੈੱਟ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ ਤੇ ਵਾਈ-ਫਾਈ ਤੋਂ ਅਸਥਾਈ ਤੌਰ ਤੇ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ"</string>
<string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="9133053225387001827">"ਤੁਹਾਡਾ Android TV ਡੀਵਾਈਸ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ \'ਤੇ ਵਾਈ-ਫਾਈ ਤੋਂ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ"</string>
<string name="wifi_p2p_frequency_conflict_message" product="default" msgid="2226863827636191980">"ਫ਼ੋਨ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ ਤੇ ਵਾਈ-ਫਾਈ ਤੋਂ ਅਸਥਾਈ ਤੌਰ ਤੇ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਏਗਾ"</string>
- <string name="dlg_ok" msgid="254496739491689405">"ਠੀਕ ਹੈ"</string>
+ <string name="dlg_ok" msgid="254496739491689405">"ਠੀਕ"</string>
<string name="wifi_cannot_connect_with_randomized_mac_title" msgid="2344570489693915253">"<xliff:g id="SSID">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
<string name="wifi_cannot_connect_with_randomized_mac_message" msgid="4834133226521813352">"ਪਰਦੇਦਾਰੀ ਸੈਟਿੰਗਾਂ ਬਦਲਣ ਲਈ ਟੈਪ ਕਰਕੇ ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
<string name="wifi_disable_mac_randomization_dialog_title" msgid="2054540994993681606">"ਕੀ ਪਰਦੇਦਾਰੀ ਸੈਟਿੰਗ ਬਦਲਣੀ ਹੈ?"</string>
diff --git a/service/ServiceWifiResources/res/values-sv/strings.xml b/service/ServiceWifiResources/res/values-sv/strings.xml
index 9b12523..75ace03 100644
--- a/service/ServiceWifiResources/res/values-sv/strings.xml
+++ b/service/ServiceWifiResources/res/values-sv/strings.xml
@@ -16,10 +16,10 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifiResourcesAppLabel" product="default" msgid="3120115613525263696">"Resurser för wifi-system"</string>
- <string name="wifi_available_title" msgid="3899472737467127635">"Anslut till ett öppet wifi-nätverk"</string>
- <string name="wifi_available_title_connecting" msgid="7233590022728579868">"Ansluter till wifi-nätverk"</string>
- <string name="wifi_available_title_connected" msgid="6329493859989844201">"Ansluten till wifi-nätverket"</string>
+ <string name="wifiResourcesAppLabel" product="default" msgid="3120115613525263696">"Resurser för Wi-Fi-system"</string>
+ <string name="wifi_available_title" msgid="3899472737467127635">"Anslut till ett öppet Wi-Fi-nätverk"</string>
+ <string name="wifi_available_title_connecting" msgid="7233590022728579868">"Ansluter till Wi-Fi-nätverk"</string>
+ <string name="wifi_available_title_connected" msgid="6329493859989844201">"Ansluten till Wi-Fi-nätverket"</string>
<string name="wifi_available_title_failed_to_connect" msgid="4840833680513368639">"Det gick inte att ansluta till Wi‑Fi-nätverket"</string>
<string name="wifi_available_content_failed_to_connect" msgid="4330035988269701861">"Tryck för att visa alla nätverk"</string>
<string name="wifi_available_action_connect" msgid="5636634933476946222">"Anslut"</string>
@@ -27,27 +27,27 @@
<string name="notification_channel_network_status" msgid="1631786866932924838">"Nätverksstatus"</string>
<string name="notification_channel_network_alerts" msgid="1391603215241200880">"Nätverksvarningar"</string>
<string name="notification_channel_network_available" msgid="8454366142428864948">"Nätverk tillgängligt"</string>
- <string name="wifi_suggestion_title" msgid="2564179935989099139">"Vill du tillåta föreslagna wifi-nätverk?"</string>
+ <string name="wifi_suggestion_title" msgid="2564179935989099139">"Vill du tillåta föreslagna Wi-Fi-nätverk?"</string>
<string name="wifi_suggestion_content" msgid="6985149577828091835">"Nätverk som föreslagits av <xliff:g id="NAME">%s</xliff:g>. Enheten kan anslutas automatiskt."</string>
<string name="wifi_suggestion_action_allow_app" msgid="7757859972144671588">"Tillåt"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="4565857699629860726">"Nej tack"</string>
- <string name="wifi_suggestion_imsi_privacy_title" msgid="8969261812845304079">"Vill du ansluta till wifi från <xliff:g id="CARRIERNAME">%s</xliff:g>?"</string>
+ <string name="wifi_suggestion_imsi_privacy_title" msgid="8969261812845304079">"Vill du ansluta till Wi-Fi från <xliff:g id="CARRIERNAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_imsi_privacy_content" msgid="4266931269306079184">"Dessa nätverk får ett SIM-id som kan användas till att spåra enhetens plats"</string>
<string name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier" msgid="3888538126440442636">"Anslut"</string>
<string name="wifi_suggestion_action_disallow_imsi_privacy_exemption_carrier" msgid="3225397664735676024">"Anslut inte"</string>
<string name="wifi_suggestion_imsi_privacy_exemption_confirmation_title" msgid="4407415300707014525">"Vill du bekräfta anslutningen?"</string>
- <string name="wifi_suggestion_imsi_privacy_exemption_confirmation_content" msgid="9211241189147807136">"Om du ansluter kan wifi-nätverk från <xliff:g id="CARRIERNAME">%s</xliff:g> få åtkomst till eller dela ett unikt id som är kopplat till ditt SIM-kort. Detta kan göra det möjligt att spåra enhetens plats."</string>
+ <string name="wifi_suggestion_imsi_privacy_exemption_confirmation_content" msgid="9211241189147807136">"Om du ansluter kan Wi-Fi-nätverk från <xliff:g id="CARRIERNAME">%s</xliff:g> få åtkomst till eller dela ett unikt id som är kopplat till ditt SIM-kort. Detta kan göra det möjligt att spåra enhetens plats."</string>
<string name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation" msgid="2168947026413431603">"Anslut"</string>
<string name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation" msgid="5156881939985876066">"Anslut inte"</string>
- <string name="wifi_wakeup_onboarding_title" msgid="3868826648004934540">"wifi aktiveras automatiskt"</string>
+ <string name="wifi_wakeup_onboarding_title" msgid="3868826648004934540">"Wi-Fi aktiveras automatiskt"</string>
<string name="wifi_wakeup_onboarding_subtext" msgid="5705886295837387430">"När du är i närheten av ett sparat nätverk av hög kvalitet"</string>
<string name="wifi_wakeup_onboarding_action_disable" msgid="6209706680391785825">"Återaktivera inte"</string>
- <string name="wifi_wakeup_enabled_title" msgid="5043486751612595850">"wifi aktiverades automatiskt"</string>
+ <string name="wifi_wakeup_enabled_title" msgid="5043486751612595850">"Wi-Fi aktiverades automatiskt"</string>
<string name="wifi_wakeup_enabled_content" msgid="3911262526267025882">"Du är i närheten av ett sparat nätverk: <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
- <string name="wifi_watchdog_network_disabled" msgid="5769226742956006362">"Det gick inte att ansluta till wifi"</string>
+ <string name="wifi_watchdog_network_disabled" msgid="5769226742956006362">"Det gick inte att ansluta till Wi-Fi"</string>
<string name="wifi_watchdog_network_disabled_detailed" msgid="1725243835135539125">" har en dålig Internetanslutning."</string>
<string name="wifi_connect_alert_title" msgid="2368200646665663612">"Tillåt anslutning?"</string>
- <string name="wifi_connect_alert_message" msgid="7226456300982080746">"Appen %1$s vill ansluta till wifi-nätverket %2$s"</string>
+ <string name="wifi_connect_alert_message" msgid="7226456300982080746">"Appen %1$s vill ansluta till Wi-Fi-nätverket %2$s"</string>
<string name="wifi_connect_default_application" msgid="8917703737222707062">"En app"</string>
<string name="accept" msgid="8346431649376483879">"Godkänn"</string>
<string name="decline" msgid="4172251727603762084">"Avvisa"</string>
@@ -58,9 +58,9 @@
<string name="wifi_p2p_to_message" msgid="3809923305696994787">"Till:"</string>
<string name="wifi_p2p_enter_pin_message" msgid="5200220251738047620">"Ange den obligatoriska PIN-koden:"</string>
<string name="wifi_p2p_show_pin_message" msgid="1000091690967930798">"PIN-kod:"</string>
- <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="2875937871590955304">"Surfplattans wifi-anslutning kommer tillfälligt att avbrytas när den är ansluten till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
- <string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="9133053225387001827">"Android TV-enheten kopplas tillfälligt från wifi medan den är ansluten till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
- <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="2226863827636191980">"Mobilen kommer tillfälligt att kopplas från wifi när den är ansluten till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="2875937871590955304">"Surfplattans Wi-Fi-anslutning kommer tillfälligt att avbrytas när den är ansluten till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="9133053225387001827">"Android TV-enheten kopplas tillfälligt från Wi-Fi medan den är ansluten till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="2226863827636191980">"Mobilen kommer tillfälligt att kopplas från Wi-Fi när den är ansluten till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="dlg_ok" msgid="254496739491689405">"OK"</string>
<string name="wifi_cannot_connect_with_randomized_mac_title" msgid="2344570489693915253">"Det gick inte att ansluta till <xliff:g id="SSID">%1$s</xliff:g>"</string>
<string name="wifi_cannot_connect_with_randomized_mac_message" msgid="4834133226521813352">"Tryck för att ändra sekretessinställningar och försök igen"</string>
@@ -79,6 +79,6 @@
<string name="wifi_eap_error_message_code_32766" msgid="2335996367705677670">"<xliff:g id="SSID">%1$s</xliff:g>: EAP-autentiseringsfel 32766"</string>
<string name="wifi_softap_auto_shutdown_timeout_expired_title" msgid="4896534374569504484">"Surfzonen har inaktiverats"</string>
<string name="wifi_softap_auto_shutdown_timeout_expired_summary" msgid="7975476698140267728">"Inga enheter har anslutits. Tryck för att ändra."</string>
- <string name="wifi_sim_required_title" msgid="2262227800991155459">"Ingen wifi-anslutning"</string>
+ <string name="wifi_sim_required_title" msgid="2262227800991155459">"Ingen Wi-Fi-anslutning"</string>
<string name="wifi_sim_required_message" msgid="284812212346125745">"Sätt i ett SIM-kort från <xliff:g id="CARRIER_NAME">%2$s</xliff:g> om du vill ansluta till <xliff:g id="SSID">%1$s</xliff:g>"</string>
</resources>
diff --git a/service/ServiceWifiResources/res/values-te/strings.xml b/service/ServiceWifiResources/res/values-te/strings.xml
index 98a2bad..9ce3214 100644
--- a/service/ServiceWifiResources/res/values-te/strings.xml
+++ b/service/ServiceWifiResources/res/values-te/strings.xml
@@ -39,10 +39,10 @@
<string name="wifi_suggestion_imsi_privacy_exemption_confirmation_content" msgid="9211241189147807136">"<xliff:g id="CARRIERNAME">%s</xliff:g> నెట్వర్క్కు మీరు కనెక్ట్ చేస్తే, ఆ క్యారియర్ Wi‑Fi నెట్వర్క్లు మీ SIMకు అనుబంధితమైన ప్రత్యేక IDని యాక్సెస్ లేదా షేర్ చేయగలగవచ్చు. దీని వలన మీ పరికరం లొకేషన్ ట్రాక్ చేయబడవచ్చు."</string>
<string name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation" msgid="2168947026413431603">"కనెక్ట్ చేయి"</string>
<string name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation" msgid="5156881939985876066">"కనెక్ట్ చేయవద్దు"</string>
- <string name="wifi_wakeup_onboarding_title" msgid="3868826648004934540">"Wi‑Fi ఆటోమేటిక్గా ఆన్ అవుతుంది"</string>
- <string name="wifi_wakeup_onboarding_subtext" msgid="5705886295837387430">"మీరు అధిక క్వాలిటీ గల సేవ్ చేసిన నెట్వర్క్కు సమీపంగా ఉన్నప్పుడు"</string>
+ <string name="wifi_wakeup_onboarding_title" msgid="3868826648004934540">"Wi‑Fi స్వయంచాలకంగా ఆన్ అవుతుంది"</string>
+ <string name="wifi_wakeup_onboarding_subtext" msgid="5705886295837387430">"మీరు అధిక నాణ్యత గల సేవ్ చేసిన నెట్వర్క్కు సమీపంగా ఉన్నప్పుడు"</string>
<string name="wifi_wakeup_onboarding_action_disable" msgid="6209706680391785825">"తిరిగి ఆన్ చేయవద్దు"</string>
- <string name="wifi_wakeup_enabled_title" msgid="5043486751612595850">"Wi‑Fi ఆటోమేటిక్గా ఆన్ చేయబడింది"</string>
+ <string name="wifi_wakeup_enabled_title" msgid="5043486751612595850">"Wi‑Fi స్వయంచాలకంగా ఆన్ చేయబడింది"</string>
<string name="wifi_wakeup_enabled_content" msgid="3911262526267025882">"మీరు సేవ్ చేసిన నెట్వర్క్కి సమీపంలో ఉన్నారు: <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
<string name="wifi_watchdog_network_disabled" msgid="5769226742956006362">"Wi-Fiకి కనెక్ట్ చేయడం సాధ్యపడలేదు"</string>
<string name="wifi_watchdog_network_disabled_detailed" msgid="1725243835135539125">" బలహీన ఇంటర్నెట్ కనెక్షన్ను కలిగి ఉంది."</string>
@@ -65,7 +65,7 @@
<string name="wifi_cannot_connect_with_randomized_mac_title" msgid="2344570489693915253">"<xliff:g id="SSID">%1$s</xliff:g>కు కనెక్ట్ చేయడం సాధ్యపడదు"</string>
<string name="wifi_cannot_connect_with_randomized_mac_message" msgid="4834133226521813352">"మీ గోప్యతా సెట్టింగ్లను మార్చడానికి నొక్కి, మళ్లీ ప్రయత్నించండి"</string>
<string name="wifi_disable_mac_randomization_dialog_title" msgid="2054540994993681606">"గోప్యతా సెట్టింగ్ను మార్చాలా?"</string>
- <string name="wifi_disable_mac_randomization_dialog_message" msgid="8874064864332248988">"కనెక్ట్ చేయడానికి, <xliff:g id="SSID">%1$s</xliff:g> అనేది ప్రత్యేకమైన ఐడెంటిఫయర్ అయిన మీ పరికరం యొక్క MAC అడ్రస్ను ఉపయోగించాల్సి ఉంటుంది. ప్రస్తుతం, ఈ నెట్వర్క్ కోసం మీ గోప్యతా సెట్టింగ్ యాదృచ్ఛిక ఐడెంటిఫయర్ను ఉపయోగిస్తుంది. \n\nఈ మార్పు వలన మీ పరికర లొకేషన్ను ట్రాక్ చేయడానికి సమీప పరికరాలకు అనుమతి లభించవచ్చు."</string>
+ <string name="wifi_disable_mac_randomization_dialog_message" msgid="8874064864332248988">"కనెక్ట్ చేయడానికి, <xliff:g id="SSID">%1$s</xliff:g> అనేది ప్రత్యేకమైన ఐడెంటిఫయర్ అయిన మీ పరికరం యొక్క MAC చిరునామాను ఉపయోగించాల్సి ఉంటుంది. ప్రస్తుతం, ఈ నెట్వర్క్ కోసం మీ గోప్యతా సెట్టింగ్ యాదృచ్ఛిక ఐడెంటిఫయర్ను ఉపయోగిస్తుంది. \n\nఈ మార్పు వలన మీ పరికర లొకేషన్ను ట్రాక్ చేయడానికి సమీప పరికరాలకు అనుమతి లభించవచ్చు."</string>
<string name="wifi_disable_mac_randomization_dialog_confirm_text" msgid="6954419863076751626">"సెట్టింగ్ను మార్చండి"</string>
<string name="wifi_disable_mac_randomization_dialog_success" msgid="5849155828154391387">"సెట్టింగ్ అప్డేట్ చేయబడింది. మళ్లీ కనెక్ట్ చేయడానికి ట్రై చేయండి."</string>
<string name="wifi_disable_mac_randomization_dialog_failure" msgid="2894643619143813096">"గోప్యతా సెట్టింగ్లను మార్చడం సాధ్యం కాదు"</string>
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 5248716..3e22b60 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -86,7 +86,6 @@
import android.os.BatteryStatsManager;
import android.os.Build;
import android.os.ConditionVariable;
-import android.os.HandlerExecutor;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
@@ -111,6 +110,7 @@
import com.android.internal.util.Protocol;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
+import com.android.modules.utils.HandlerExecutor;
import com.android.modules.utils.build.SdkLevel;
import com.android.net.module.util.Inet4AddressUtils;
import com.android.net.module.util.MacAddressUtils;
diff --git a/service/java/com/android/server/wifi/ConcreteClientModeManager.java b/service/java/com/android/server/wifi/ConcreteClientModeManager.java
index 1e6d63d..03b20f9 100644
--- a/service/java/com/android/server/wifi/ConcreteClientModeManager.java
+++ b/service/java/com/android/server/wifi/ConcreteClientModeManager.java
@@ -41,7 +41,6 @@
import android.net.wifi.hotspot2.OsuProvider;
import android.net.wifi.nl80211.DeviceWiphyCapabilities;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
@@ -64,6 +63,7 @@
import com.android.internal.util.IState;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
+import com.android.modules.utils.HandlerExecutor;
import com.android.server.wifi.WifiNative.InterfaceCallback;
import com.android.server.wifi.WifiNative.RxFateReport;
import com.android.server.wifi.WifiNative.TxFateReport;
diff --git a/service/java/com/android/server/wifi/SarManager.java b/service/java/com/android/server/wifi/SarManager.java
index 03af0c7..df73179 100644
--- a/service/java/com/android/server/wifi/SarManager.java
+++ b/service/java/com/android/server/wifi/SarManager.java
@@ -30,13 +30,13 @@
import android.media.AudioManager;
import android.net.wifi.WifiManager;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.Looper;
import android.os.PowerManager;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.util.Log;
+import com.android.modules.utils.HandlerExecutor;
import com.android.server.wifi.util.WifiHandler;
import com.android.wifi.resources.R;
diff --git a/service/java/com/android/server/wifi/ScanRequestProxy.java b/service/java/com/android/server/wifi/ScanRequestProxy.java
index 0d835ec..95380ef 100644
--- a/service/java/com/android/server/wifi/ScanRequestProxy.java
+++ b/service/java/com/android/server/wifi/ScanRequestProxy.java
@@ -29,7 +29,6 @@
import android.net.wifi.WifiManager;
import android.net.wifi.WifiScanner;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.UserHandle;
@@ -39,6 +38,7 @@
import android.util.Pair;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.HandlerExecutor;
import com.android.modules.utils.build.SdkLevel;
import com.android.server.wifi.util.ScanResultUtil;
import com.android.server.wifi.util.WifiPermissionsUtil;
diff --git a/service/java/com/android/server/wifi/WakeupController.java b/service/java/com/android/server/wifi/WakeupController.java
index ac5287d..1939760 100644
--- a/service/java/com/android/server/wifi/WakeupController.java
+++ b/service/java/com/android/server/wifi/WakeupController.java
@@ -23,12 +23,12 @@
import android.net.wifi.WifiNetworkSuggestion;
import android.net.wifi.WifiScanner;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.Process;
import android.provider.Settings;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.HandlerExecutor;
import java.io.FileDescriptor;
import java.io.PrintWriter;
diff --git a/service/java/com/android/server/wifi/WifiCarrierInfoManager.java b/service/java/com/android/server/wifi/WifiCarrierInfoManager.java
index a172970..ff0c4ce 100644
--- a/service/java/com/android/server/wifi/WifiCarrierInfoManager.java
+++ b/service/java/com/android/server/wifi/WifiCarrierInfoManager.java
@@ -42,7 +42,6 @@
import android.net.wifi.hotspot2.pps.Credential;
import android.os.Build;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.PersistableBundle;
import android.os.UserHandle;
import android.telephony.CarrierConfigManager;
@@ -63,6 +62,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
+import com.android.modules.utils.HandlerExecutor;
import com.android.modules.utils.build.SdkLevel;
import com.android.wifi.resources.R;
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java
index e8507ce..99796c7 100644
--- a/service/java/com/android/server/wifi/WifiConnectivityManager.java
+++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java
@@ -42,7 +42,6 @@
import android.net.wifi.WifiScanner.ScanSettings;
import android.net.wifi.hotspot2.PasspointConfiguration;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.PowerManager;
import android.os.Process;
import android.os.WorkSource;
@@ -52,6 +51,7 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.HandlerExecutor;
import com.android.modules.utils.build.SdkLevel;
import com.android.server.wifi.hotspot2.PasspointManager;
import com.android.server.wifi.util.ScanResultUtil;
diff --git a/service/java/com/android/server/wifi/WifiDataStall.java b/service/java/com/android/server/wifi/WifiDataStall.java
index 125acbd..bb9b9bb 100644
--- a/service/java/com/android/server/wifi/WifiDataStall.java
+++ b/service/java/com/android/server/wifi/WifiDataStall.java
@@ -25,12 +25,12 @@
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager.DeviceMobilityState;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.telephony.PhoneStateListener;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.Log;
+import com.android.modules.utils.HandlerExecutor;
import com.android.server.wifi.ActiveModeWarden.PrimaryClientModeManagerChangedCallback;
import com.android.server.wifi.WifiNative.ConnectionCapabilities;
import com.android.server.wifi.proto.nano.WifiMetricsProto.WifiIsUnusableEvent;
diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index 7a43efe..1ca8fe5 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -34,7 +34,6 @@
import android.net.wifi.nl80211.WifiNl80211Manager;
import android.os.BatteryStatsManager;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Process;
@@ -49,6 +48,7 @@
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.HandlerExecutor;
import com.android.modules.utils.build.SdkLevel;
import com.android.server.wifi.aware.WifiAwareMetrics;
import com.android.server.wifi.coex.CoexManager;
diff --git a/service/java/com/android/server/wifi/WifiNetworkFactory.java b/service/java/com/android/server/wifi/WifiNetworkFactory.java
index f6e46a9..c757641 100644
--- a/service/java/com/android/server/wifi/WifiNetworkFactory.java
+++ b/service/java/com/android/server/wifi/WifiNetworkFactory.java
@@ -50,7 +50,6 @@
import android.net.wifi.WifiNetworkSpecifier;
import android.net.wifi.WifiScanner;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.Looper;
import android.os.PatternMatcher;
import android.os.PowerManager;
@@ -64,6 +63,7 @@
import android.util.Pair;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.HandlerExecutor;
import com.android.server.wifi.proto.nano.WifiMetricsProto;
import com.android.server.wifi.util.ActionListenerWrapper;
import com.android.server.wifi.util.ScanResultUtil;
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 24944c0..4e33614 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -104,7 +104,6 @@
import android.os.Binder;
import android.os.Build;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.IBinder;
import android.os.Looper;
import android.os.ParcelFileDescriptor;
@@ -129,6 +128,7 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.HandlerExecutor;
import com.android.modules.utils.ParceledListSlice;
import com.android.modules.utils.build.SdkLevel;
import com.android.net.module.util.Inet4AddressUtils;
diff --git a/service/java/com/android/server/wifi/coex/CoexManager.java b/service/java/com/android/server/wifi/coex/CoexManager.java
index 326bb85..6168784 100644
--- a/service/java/com/android/server/wifi/coex/CoexManager.java
+++ b/service/java/com/android/server/wifi/coex/CoexManager.java
@@ -48,7 +48,6 @@
import android.net.wifi.WifiManager.CoexRestriction;
import android.os.Build;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.PersistableBundle;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
@@ -67,6 +66,7 @@
import androidx.annotation.RequiresApi;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.HandlerExecutor;
import com.android.server.wifi.WifiNative;
import com.android.wifi.resources.R;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java b/service/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java
index ce9a761..18c00ba 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java
@@ -90,33 +90,29 @@
10000, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
assertEquals("[2400,5100]", ChannelHelper.toString(scanSettings));
}
- }
- /**
- * Unit tests for
- * {@link com.android.server.wifi.scanner.ChannelHelper#bandToString}.
- */
- @Test
- public void bandToString_ShouldReturnApproapriateString() {
- assertEquals("unspecified", ChannelHelper.bandToString(
- WifiScanner.WIFI_BAND_UNSPECIFIED));
- assertEquals("24Ghz", ChannelHelper.bandToString(WifiScanner.WIFI_BAND_24_GHZ));
- assertEquals("5Ghz (no DFS)", ChannelHelper.bandToString(WifiScanner.WIFI_BAND_5_GHZ));
- assertEquals("5Ghz (DFS only)", ChannelHelper.bandToString(
- WifiScanner.WIFI_BAND_5_GHZ_DFS_ONLY));
- assertEquals("5Ghz (DFS incl)", ChannelHelper.bandToString(
- WifiScanner.WIFI_BAND_5_GHZ_WITH_DFS));
- assertEquals("24Ghz & 5Ghz (no DFS)", ChannelHelper.bandToString(
- WifiScanner.WIFI_BAND_BOTH));
- assertEquals("24Ghz & 5Ghz (DFS incl)", ChannelHelper.bandToString(
- WifiScanner.WIFI_BAND_BOTH_WITH_DFS));
- assertEquals("24Ghz & 5Ghz (DFS incl) & 6Ghz", ChannelHelper.bandToString(
- WifiScanner.WIFI_BAND_24_5_WITH_DFS_6_GHZ));
- assertEquals("2.4 GHz & 5 GHz (no DFS) & 6GHz & 60GHz", ChannelHelper.bandToString(
- WifiScanner.WIFI_BAND_24_5_6_60_GHZ));
- assertEquals("2.4 GHz & 5Ghz (DFS incl) & 6GHz & 60GHz", ChannelHelper.bandToString(
- WifiScanner.WIFI_BAND_24_5_WITH_DFS_6_60_GHZ));
- assertEquals("invalid band", ChannelHelper.bandToString(-235342));
+ /**
+ * Unit tests for
+ * {@link com.android.server.wifi.scanner.ChannelHelper#bandToString}.
+ */
+ @Test
+ public void bandToString_ShouldReturnApproapriateString() {
+ assertEquals("unspecified", ChannelHelper.bandToString(
+ WifiScanner.WIFI_BAND_UNSPECIFIED));
+ assertEquals("24Ghz", ChannelHelper.bandToString(WifiScanner.WIFI_BAND_24_GHZ));
+ assertEquals("5Ghz (no DFS)", ChannelHelper.bandToString(WifiScanner.WIFI_BAND_5_GHZ));
+ assertEquals("5Ghz (DFS only)", ChannelHelper.bandToString(
+ WifiScanner.WIFI_BAND_5_GHZ_DFS_ONLY));
+ assertEquals("5Ghz (DFS incl)", ChannelHelper.bandToString(
+ WifiScanner.WIFI_BAND_5_GHZ_WITH_DFS));
+ assertEquals("24Ghz & 5Ghz (no DFS)", ChannelHelper.bandToString(
+ WifiScanner.WIFI_BAND_BOTH));
+ assertEquals("24Ghz & 5Ghz (DFS incl)", ChannelHelper.bandToString(
+ WifiScanner.WIFI_BAND_BOTH_WITH_DFS));
+ assertEquals("24Ghz & 5Ghz (DFS incl) & 6Ghz", ChannelHelper.bandToString(
+ WifiScanner.WIFI_BAND_24_5_WITH_DFS_6_GHZ));
+ assertEquals("Invalid band", ChannelHelper.bandToString(-235342));
+ }
}
/**
