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

[Wi-Fi] Prevent fatal exception for null intent action

Browse Source 
Intent action may be null.

Bug: 139020487
Test: WifiScanModeActivityTest
      WifiNoInternetDialogTest
      WifiDppConfiguratorActivityTest
      WifiDppEnrolleeActivityTest
Change-Id: Ie6119a86aaee1a6b40710705a0ea7d92c24736d6
This commit is contained in:
Arc Wang
2019-08-22 10:28:55 +08:00
parent 6ef36e9c34
commit 1e451cf708
8 changed files with 143 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiNoInternetDialog.java
View File

@@ -55,9 +55,9 @@ public final class WifiNoInternetDialog extends AlertActivity implements
private boolean mButtonClicked;
private boolean isKnownAction(Intent intent) {
return intent.getAction().equals(ACTION_PROMPT_UNVALIDATED)
|| intent.getAction().equals(ACTION_PROMPT_LOST_VALIDATION)
|| intent.getAction().equals(ACTION_PROMPT_PARTIAL_CONNECTIVITY);
return ACTION_PROMPT_UNVALIDATED.equals(intent.getAction())
|| ACTION_PROMPT_LOST_VALIDATION.equals(intent.getAction())
|| ACTION_PROMPT_PARTIAL_CONNECTIVITY.equals(intent.getAction());
}
@Override

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

@@ -46,8 +46,8 @@ public class WifiScanModeActivity extends FragmentActivity {
super.onCreate(savedInstanceState);
Intent intent = getIntent();
if (savedInstanceState == null) {
if (intent != null && intent.getAction()
.equals(WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE)) {
if (intent != null && WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE
.equals(intent.getAction())) {
ApplicationInfo ai;
mApp = getCallingPackage();
try {

8
src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
View File

@@ -109,9 +109,15 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements
@Override
protected void handleIntent(Intent intent) {
String action = intent != null ? intent.getAction() : null;
if (action == null) {
finish();
return;
}
boolean cancelActivity = false;
WifiNetworkConfig config;
switch (intent.getAction()) {
switch (action) {
case ACTION_CONFIGURATOR_QR_CODE_SCANNER:
config = WifiNetworkConfig.getValidConfigOrNull(intent);
if (config == null) {

8
src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
View File

@@ -44,7 +44,13 @@ public class WifiDppEnrolleeActivity extends WifiDppBaseActivity implements
@Override
protected void handleIntent(Intent intent) {
switch (intent.getAction()) {
String action = intent != null ? intent.getAction() : null;
if (action == null) {
finish();
return;
}
switch (action) {
case ACTION_ENROLLEE_QR_CODE_SCANNER:
String ssid = intent.getStringExtra(WifiDppUtils.EXTRA_WIFI_SSID);
showQrCodeScannerFragment(ssid);