From 93036e2045d48ff2a0fffeab9a8edf7863af4777 Mon Sep 17 00:00:00 2001 From: Yuchen Sun Date: Thu, 18 Jul 2024 06:39:53 +0000 Subject: [PATCH] Clean up slice from spa and move androidx.slice dependency to Settings. Test: build successfully Flag: EXEMPT clean up Bug: 352442832 Change-Id: Ifc222a91991d4924f1cb7b5c1e7fd90968bfed26 --- Android.bp | 3 +++ .../settings/spa/core/instrumentation/SpaLogProvider.kt | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Android.bp b/Android.bp index 0fd4cb09389..4c472c8c411 100644 --- a/Android.bp +++ b/Android.bp @@ -68,6 +68,9 @@ android_library { static_libs: [ // External dependencies "androidx.navigation_navigation-fragment-ktx", + "androidx.slice_slice-builders", + "androidx.slice_slice-core", + "androidx.slice_slice-view", "androidx.window_window-java", "gson", "guava", diff --git a/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt b/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt index 8659bf56884..4377ccc6734 100644 --- a/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt +++ b/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt @@ -28,7 +28,6 @@ import com.android.settingslib.spa.framework.common.SpaLogger import com.android.settingslib.spa.framework.util.SESSION_BROWSE import com.android.settingslib.spa.framework.util.SESSION_EXTERNAL import com.android.settingslib.spa.framework.util.SESSION_SEARCH -import com.android.settingslib.spa.framework.util.SESSION_SLICE import com.android.settingslib.spa.framework.util.SESSION_UNKNOWN /** @@ -74,7 +73,6 @@ class SpaLogData(val id: String, val event: LogEvent, return when(sessionSource) { SESSION_BROWSE -> SettingsEnums.SESSION_BROWSE SESSION_SEARCH -> SettingsEnums.SESSION_SEARCH - SESSION_SLICE -> SettingsEnums.SESSION_SLICE_TYPE SESSION_EXTERNAL -> SettingsEnums.SESSION_EXTERNAL else -> SettingsEnums.SESSION_UNKNOWN }