commit 3e737c11db44c92f28e7b9d5d6321f7537887888
author Chiachang Wang <chiachangwang@google.com> Fri Mar 19 08:13:06 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 19 08:13:06 2021 +0000
tree cfe64a5e648dc97b150beed685c4609cbc90123f
parent f26f579c8da0a0df1c05f337705cfd3335f31055
parent eedfa1d3078221ae3d54a53b1e84c38df9a77736

Merge "Remove hidden connectivity methods access"

src/com/android/settings/vpn2/OWNERS

diff --git a/src/com/android/settings/vpn2/OWNERS b/src/com/android/settings/vpn2/OWNERS
index 0419e24..894d604 100644
--- a/src/com/android/settings/vpn2/OWNERS
+++ b/src/com/android/settings/vpn2/OWNERS
@@ -4,6 +4,7 @@
 maze@google.com
 reminv@google.com
 xiaom@google.com
+goldmanj@google.com
 
 # Emergency approvers in case the above are not available
 satk@google.com

src/com/android/settings/wifi/WifiNoInternetDialog.java

diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java
index ccfda3a..10f4c79 100644
--- a/src/com/android/settings/wifi/WifiNoInternetDialog.java
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -65,22 +65,17 @@
         super.onCreate(savedInstanceState);
 
         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");
             finish();
             return;
         }
 
         mAction = intent.getAction();
-
-        try {
-            mNetwork = new Network(Integer.parseInt(intent.getData().getSchemeSpecificPart()));
-        } catch (NullPointerException|NumberFormatException e) {
-            mNetwork = null;
-        }
+        mNetwork = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
 
         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();
             return;
         }