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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-22 09:51:01 +00:00
committed by Android (Google) Code Review
parent 5027a5243a 1e451cf708
commit 04e72e23d9
8 changed files with 143 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);