From b0885a155ad58500d6800a341304791d01eed19a Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Mon, 10 Apr 2023 14:56:27 +0800 Subject: [PATCH] Add a feature flag for SPA metrics - Add a new SETTINGS_ENABLE_SPA_METRICS flag. Fixes: 277540990 Bug: 253979024 Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest Change-Id: I6da801691fd34fd133ec25d3a45ed6124bec51a1 Merged-In: Iba7a44715cf6ba78c3b84d559faf71a0be33d8d3 --- src/com/android/settings/spa/SettingsSpaEnvironment.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt index c2716b6e5ca..455fe9ff4b9 100644 --- a/src/com/android/settings/spa/SettingsSpaEnvironment.kt +++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt @@ -17,6 +17,7 @@ package com.android.settings.spa import android.content.Context +import android.util.FeatureFlagUtils import com.android.settings.spa.app.AllAppListPageProvider import com.android.settings.spa.app.AppsMainPageProvider import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider @@ -43,6 +44,7 @@ import com.android.settings.spa.system.LanguageAndInputPageProvider import com.android.settings.spa.system.SystemMainPageProvider import com.android.settingslib.spa.framework.common.SettingsPageProviderRepository import com.android.settingslib.spa.framework.common.SpaEnvironment +import com.android.settingslib.spa.framework.common.SpaLogger import com.android.settingslib.spa.framework.common.createSettingsPage import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListProvider import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListTemplate @@ -88,5 +90,8 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) { ), ) } - override val logger = SpaLogProvider + override val logger = + if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_ENABLE_SPA_METRICS)) + SpaLogProvider + else object: SpaLogger {} }