PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix null App name in Wi-Fi scanning prompt dialog" into qt-dev am: ab3fed9b69

Browse Source 
am: 1a5bd24d58

Change-Id: I8f9bd81444f663470b1f7514d51d75d90a1038d6
This commit is contained in:
cosmohsieh
2019-04-12 17:31:13 -07:00
committed by android-build-merger
parent ea28576e7a 1a5bd24d58
commit ad92bf67e4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/WifiScanModeActivity.java
View File

@@ -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) {