Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make WifiDppEnrolleeActivity launches explicit

Browse Source 
Bug: 180518134
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppUtilsTest\|WifiDialogActivityTest
Test: Manually verified b/180518134 attack is no longer possible

Change-Id: I8c4e1e17117582c78671d0e4658bd87715a9a046
This commit is contained in:
Linus Tufvesson
2021-07-05 18:02:10 +01:00
parent 131a4abef4
commit 59c0a7bc63
7 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,7 +320,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
@Override
public void onScan(WifiDialog2 dialog, String ssid) {
Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid);
Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(dialog.getContext(), ssid);
WizardManagerHelper.copyWizardManagerExtras(mIntent, intent);
// Launch QR code scanner to join a network.
@@ -329,7 +329,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
@Override
public void onScan(WifiDialog dialog, String ssid) {
Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid);
Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(dialog.getContext(), ssid);
WizardManagerHelper.copyWizardManagerExtras(mIntent, intent);
// Launch QR code scanner to join a network.