diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEvent.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEvent.java index c70cf220c3be..93c5a36ec2a1 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEvent.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEvent.java @@ -69,10 +69,6 @@ public class GeckoEvent { NATIVE_GESTURE_EVENT(31), CALL_OBSERVER(33), REMOVE_OBSERVER(34), - TELEMETRY_HISTOGRAM_ADD(37), - TELEMETRY_UI_SESSION_START(42), - TELEMETRY_UI_SESSION_STOP(43), - TELEMETRY_UI_EVENT(44), GAMEPAD_ADDREMOVE(45), GAMEPAD_DATA(46), LONG_PRESS(47); @@ -343,50 +339,6 @@ public class GeckoEvent { return event; } - public static GeckoEvent createTelemetryHistogramAddEvent(String histogram, - int value) { - GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.TELEMETRY_HISTOGRAM_ADD); - event.mCharacters = histogram; - // Set the extras with null so that it cannot be mistaken with a keyed histogram. - event.mCharactersExtra = null; - event.mCount = value; - return event; - } - - public static GeckoEvent createTelemetryKeyedHistogramAddEvent(String histogram, - String key, - int value) { - GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.TELEMETRY_HISTOGRAM_ADD); - event.mCharacters = histogram; - event.mCharactersExtra = key; - event.mCount = value; - return event; - } - - public static GeckoEvent createTelemetryUISessionStartEvent(String session, long timestamp) { - GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.TELEMETRY_UI_SESSION_START); - event.mCharacters = session; - event.mTime = timestamp; - return event; - } - - public static GeckoEvent createTelemetryUISessionStopEvent(String session, String reason, long timestamp) { - GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.TELEMETRY_UI_SESSION_STOP); - event.mCharacters = session; - event.mCharactersExtra = reason; - event.mTime = timestamp; - return event; - } - - public static GeckoEvent createTelemetryUIEvent(String action, String method, long timestamp, String extras) { - GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.TELEMETRY_UI_EVENT); - event.mData = action; - event.mCharacters = method; - event.mCharactersExtra = extras; - event.mTime = timestamp; - return event; - } - public static GeckoEvent createGamepadAddRemoveEvent(int id, boolean added) { GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.GAMEPAD_ADDREMOVE); event.mID = id; diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp index 5d3f5ea56336..42419bd0c3fc 100644 --- a/widget/android/AndroidJavaWrappers.cpp +++ b/widget/android/AndroidJavaWrappers.cpp @@ -320,34 +320,6 @@ AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj) break; } - case TELEMETRY_HISTOGRAM_ADD: { - ReadCharactersField(jenv); - ReadCharactersExtraField(jenv); - mCount = jenv->GetIntField(jobj, jCountField); - break; - } - - case TELEMETRY_UI_SESSION_START: { - ReadCharactersField(jenv); - mTime = jenv->GetLongField(jobj, jTimeField); - break; - } - - case TELEMETRY_UI_SESSION_STOP: { - ReadCharactersField(jenv); - ReadCharactersExtraField(jenv); - mTime = jenv->GetLongField(jobj, jTimeField); - break; - } - - case TELEMETRY_UI_EVENT: { - ReadCharactersField(jenv); - ReadCharactersExtraField(jenv); - ReadDataField(jenv); - mTime = jenv->GetLongField(jobj, jTimeField); - break; - } - case GAMEPAD_ADDREMOVE: { mID = jenv->GetIntField(jobj, jIDField); break; diff --git a/widget/android/AndroidJavaWrappers.h b/widget/android/AndroidJavaWrappers.h index 68f22623a25f..5a2b9d02d901 100644 --- a/widget/android/AndroidJavaWrappers.h +++ b/widget/android/AndroidJavaWrappers.h @@ -583,11 +583,7 @@ public: NATIVE_GESTURE_EVENT = 31, CALL_OBSERVER = 33, REMOVE_OBSERVER = 34, - TELEMETRY_HISTOGRAM_ADD = 37, ADD_OBSERVER = 38, - TELEMETRY_UI_SESSION_START = 42, - TELEMETRY_UI_SESSION_STOP = 43, - TELEMETRY_UI_EVENT = 44, GAMEPAD_ADDREMOVE = 45, GAMEPAD_DATA = 46, LONG_PRESS = 47, diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp index b2309d8662b2..6ae87b1b5445 100644 --- a/widget/android/nsAppShell.cpp +++ b/widget/android/nsAppShell.cpp @@ -671,63 +671,6 @@ nsAppShell::LegacyGeckoEvent::Run() break; } - case AndroidGeckoEvent::TELEMETRY_UI_SESSION_STOP: { - if (!nsAppShell::Get()->mBrowserApp) - break; - if (curEvent->Characters().Length() == 0) - break; - - nsCOMPtr obs; - nsAppShell::Get()->mBrowserApp->GetUITelemetryObserver(getter_AddRefs(obs)); - if (!obs) - break; - - obs->StopSession( - curEvent->Characters().get(), - curEvent->CharactersExtra().get(), - curEvent->Time() - ); - break; - } - - case AndroidGeckoEvent::TELEMETRY_UI_SESSION_START: { - if (!nsAppShell::Get()->mBrowserApp) - break; - if (curEvent->Characters().Length() == 0) - break; - - nsCOMPtr obs; - nsAppShell::Get()->mBrowserApp->GetUITelemetryObserver(getter_AddRefs(obs)); - if (!obs) - break; - - obs->StartSession( - curEvent->Characters().get(), - curEvent->Time() - ); - break; - } - - case AndroidGeckoEvent::TELEMETRY_UI_EVENT: { - if (!nsAppShell::Get()->mBrowserApp) - break; - if (curEvent->Data().Length() == 0) - break; - - nsCOMPtr obs; - nsAppShell::Get()->mBrowserApp->GetUITelemetryObserver(getter_AddRefs(obs)); - if (!obs) - break; - - obs->AddEvent( - curEvent->Data().get(), - curEvent->Characters().get(), - curEvent->Time(), - curEvent->CharactersExtra().get() - ); - break; - } - case AndroidGeckoEvent::CALL_OBSERVER: { nsCOMPtr observer; @@ -751,18 +694,6 @@ nsAppShell::LegacyGeckoEvent::Run() nsAppShell::Get()->AddObserver(curEvent->Characters(), curEvent->Observer()); break; - case AndroidGeckoEvent::TELEMETRY_HISTOGRAM_ADD: - // If the extras field is not empty then this is a keyed histogram. - if (!curEvent->CharactersExtra().IsVoid()) { - Telemetry::Accumulate(NS_ConvertUTF16toUTF8(curEvent->Characters()).get(), - NS_ConvertUTF16toUTF8(curEvent->CharactersExtra()), - curEvent->Count()); - } else { - Telemetry::Accumulate(NS_ConvertUTF16toUTF8(curEvent->Characters()).get(), - curEvent->Count()); - } - break; - case AndroidGeckoEvent::GAMEPAD_ADDREMOVE: { #ifdef MOZ_GAMEPAD RefPtr service;