From 828512f14c9e10e6614fde512d5a44cb0fddfda4 Mon Sep 17 00:00:00 2001
From: Hugo Benichi <hugobenichi@google.com>
Date: Fri, 9 Jun 2017 11:30:05 +0000
Subject: [PATCH] Revert "Instrument captive portal login activity"

This reverts commit f867da14eaa194cb53b0726b50e570268e70f1d7.

Change-Id: Ic900c91ed87c2d65c151f8386954bd7b74128348
---
 .../CaptivePortalLoginActivity.java           | 21 +------------------
 proto/src/metrics_constants.proto             |  5 -----
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 75c71aaafc600..3601a0aa57461 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -46,9 +46,6 @@ import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.MetricsProto.MetricsEvent;
-
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -65,14 +62,7 @@ public class CaptivePortalLoginActivity extends Activity {
 
     private static final int SOCKET_TIMEOUT_MS = 10000;
 
-    private enum Result {
-        DISMISSED(MetricsEvent.ACTION_CAPTIVE_PORTAL_LOGIN_RESULT_DISMISSED),
-        UNWANTED(MetricsEvent.ACTION_CAPTIVE_PORTAL_LOGIN_RESULT_UNWANTED),
-        WANTED_AS_IS(MetricsEvent.ACTION_CAPTIVE_PORTAL_LOGIN_RESULT_WANTED_AS_IS);
-
-        final int metricsEvent;
-        Result(int metricsEvent) { this.metricsEvent = metricsEvent; }
-    };
+    private enum Result { DISMISSED, UNWANTED, WANTED_AS_IS };
 
     private URL mUrl;
     private String mUserAgent;
@@ -86,9 +76,6 @@ public class CaptivePortalLoginActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        logMetricsEvent(MetricsEvent.ACTION_CAPTIVE_PORTAL_LOGIN_ACTIVITY);
-
         mCm = ConnectivityManager.from(this);
         mNetwork = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
         mCaptivePortal = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL);
@@ -185,7 +172,6 @@ public class CaptivePortalLoginActivity extends Activity {
             mCm.unregisterNetworkCallback(mNetworkCallback);
             mNetworkCallback = null;
         }
-        logMetricsEvent(result.metricsEvent);
         switch (result) {
             case DISMISSED:
                 mCaptivePortal.reportCaptivePortalDismissed();
@@ -394,7 +380,6 @@ public class CaptivePortalLoginActivity extends Activity {
 
         @Override
         public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-            logMetricsEvent(MetricsEvent.CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR);
             Log.w(TAG, "SSL error (error: " + error.getPrimaryError() + " host: " +
                     // Only show host to avoid leaking private info.
                     Uri.parse(error.getUrl()).getHost() + " certificate: " +
@@ -498,8 +483,4 @@ public class CaptivePortalLoginActivity extends Activity {
         }
         return url.getHost();
     }
-
-    private void logMetricsEvent(int event) {
-        MetricsLogger.action(this, event, getPackageName());
-    }
 }
diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 58f1cd87937d7..8bc7520d880d6 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -2278,11 +2278,6 @@ message MetricsEvent {
     // OS: O DR
     ACTION_WIFI_SIGNIN = 1008;
 
-    // CaptivePortalLoginActivity displays SSL error page
-    // CATEGORY: GLOBAL_SYSTEM_UI
-    // OS: O DR
-    CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR = 1013;
-
     // Add new aosp constants above this line.
     // END OF AOSP CONSTANTS
   }