From 139ce67ac099bca6e91c6d0e00ea770887dd6340 Mon Sep 17 00:00:00 2001 From: Zekan Qian Date: Mon, 6 Feb 2023 15:35:09 +0800 Subject: [PATCH] Add comment for cases of multiple from-pages. Bug: 244122804 Test: unit-test & local build gallery Change-Id: I8629b2e01b0ac4322027c07e6c17ad4853d03a8a --- .../spa/framework/common/SettingsEntryRepository.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsEntryRepository.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsEntryRepository.kt index 7aeefd23d1160..429f97bb38d07 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsEntryRepository.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsEntryRepository.kt @@ -62,6 +62,9 @@ class SettingsEntryRepository(sppRepository: SettingsPageProviderRepository) { if (page == null || pageWithEntryMap.containsKey(page.id)) continue val spp = sppRepository.getProviderOrNull(page.sppName) ?: continue val newEntries = spp.buildEntry(page.arguments) + // The page id could be existed already, if there are 2+ pages go to the same one. + // For now, override the previous ones, which means only the last from-page is kept. + // TODO: support multiple from-pages if necessary. pageWithEntryMap[page.id] = SettingsPageWithEntry( page = page, entries = newEntries,