commit 9e8ab43ab22555acff9fefca2ed433425c92fb87
author Hugo Benichi <hugobenichi@google.com> Mon Jun 05 14:52:24 2017 +0900
committer Hugo Benichi <hugobenichi@google.com> Fri Jun 09 02:51:36 2017 +0000
tree b14cd1930dc9d106ed95175b572708adc565ea10
parent 63f23f8dd72d786a0477aca720e59dcbcefddfe0

Instrument captive portal login activity

Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.

Bug: 36203355
Bug: 34901696
Bug: 36532213
Test: manually tested with captive portal testing setup while watching
      event logs: adb logcat -b events | grep captiveportallogin
        06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
        06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]

Change-Id: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
(cherry picked from commit c61dc92fc0619d101c4b789f6305012701cc47a0)

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 11ea841..fa2b1ee 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -4090,6 +4090,11 @@
     // OS: O DR
     SETTINGS_ASSIST_GESTURE_FIRST_TIME = 1012;
 
+    // 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
   }