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

Merge "Replace the way to get the network for no internet dialog" am: f26f579c8d am: 33855bfd7e am: b2da781ff9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644547

Change-Id: I1a89caad4178c56e3bc45e7aa1ed5bb3ad79ce78
This commit is contained in:
Chiachang Wang
2021-03-19 09:43:49 +00:00
committed by Automerger Merge Worker
parent ebcb3308ee b2da781ff9
commit a1abb8158d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,22 +70,17 @@ public class WifiNoInternetDialog extends AlertActivity implements
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final Intent intent = getIntent(); final Intent intent = getIntent();
if (intent == null || !isKnownAction(intent) || !"netId".equals(intent.getScheme())) { if (intent == null || !isKnownAction(intent)) {
Log.e(TAG, "Unexpected intent " + intent + ", exiting"); Log.e(TAG, "Unexpected intent " + intent + ", exiting");
finish(); finish();
return; return;
} }
mAction = intent.getAction(); mAction = intent.getAction();
mNetwork = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
try {
mNetwork = new Network(Integer.parseInt(intent.getData().getSchemeSpecificPart()));
} catch (NullPointerException|NumberFormatException e) {
mNetwork = null;
}
if (mNetwork == null) { if (mNetwork == null) {
Log.e(TAG, "Can't determine network from '" + intent.getData() + "' , exiting"); Log.e(TAG, "Can't determine network from intent extra, exiting");
finish(); finish();
return; return;
} }