commit 7569d82740d85e434be403f6fb97d399619409f1
author Chalard Jean <jchalard@google.com> Thu May 28 04:24:39 2020 +0000
committer Chiachang Wang <chiachangwang@google.com> Tue Jun 02 01:03:06 2020 +0000
tree 564647612f8c22a88f26d9d975e95521834ca0ba
parent 7f2331003af41521291eb277f5f7c5bc290d948e

Fix an NPE

Also opportunistically remove similar useless calls

Bug: 157433005
Test: manual
Change-Id: I818bce247dd9d59405d3cdae25e69ce7e6c61ba6
Merged-In: I818bce247dd9d59405d3cdae25e69ce7e6c61ba6
(cherry picked from commit 30379cd5f95b96b5cd909df73d315576d8850f76)

src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

diff --git a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index ba7fb2e..38b3537 100755
--- a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -165,7 +165,7 @@
             return;
         }
         if (DBG) {
-            Log.d(TAG, String.format("onCreate for %s", mUrl.toString()));
+            Log.d(TAG, String.format("onCreate for %s", mUrl));
         }
 
         final String spec = getIntent().getStringExtra(EXTRA_CAPTIVE_PORTAL_PROBE_SPEC);
@@ -294,7 +294,7 @@
             return;
         }
         if (DBG) {
-            Log.d(TAG, String.format("Result %s for %s", result.name(), mUrl.toString()));
+            Log.d(TAG, String.format("Result %s for %s", result.name(), mUrl));
         }
         logMetricsEvent(result.metricsEvent);
         switch (result) {
@@ -345,7 +345,7 @@
             return super.onOptionsItemSelected(item);
         }
         if (DBG) {
-            Log.d(TAG, String.format("onOptionsItemSelect %s for %s", action, mUrl.toString()));
+            Log.d(TAG, String.format("onOptionsItemSelect %s for %s", action, mUrl));
         }
         done(result);
         return true;