diff --git a/res/values/strings.xml b/res/values/strings.xml index 1567c7559f6..a0e572deabc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2237,6 +2237,8 @@ Connect via %1$s To improve location accuracy and for other purposes, %1$s wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan? + + To improve location accuracy and for other purposes, an unknown app wants to turn on network scanning, even when Wi\u2011Fi is off.\n\nAllow this for all apps that want to scan? To turn this off, go to Advanced in the overflow menu. Allow diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java index 934e9724a06..53427299df1 100644 --- a/src/com/android/settings/wifi/WifiScanModeActivity.java +++ b/src/com/android/settings/wifi/WifiScanModeActivity.java @@ -25,6 +25,7 @@ import android.content.pm.PackageManager; import android.net.wifi.WifiManager; import android.os.Bundle; import android.provider.Settings; +import android.text.TextUtils; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; @@ -132,7 +133,9 @@ public class WifiScanModeActivity extends FragmentActivity { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { return new AlertDialog.Builder(getActivity()) - .setMessage(getString(R.string.wifi_scan_always_turnon_message, mApp)) + .setMessage(TextUtils.isEmpty(mApp) ? + getString(R.string.wifi_scan_always_turn_on_message_unknown) : + getString(R.string.wifi_scan_always_turnon_message, mApp)) .setPositiveButton(R.string.wifi_scan_always_confirm_allow, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) {