From 5b018c5c74d93c9b71d71918de915bdd2341015b Mon Sep 17 00:00:00 2001
From: Zekan Qian <pierreqian@google.com>
Date: Fri, 11 Nov 2022 12:12:26 +0800
Subject: [PATCH] Use name as fallback of displayName

Bug: 244122804
Test: unit-test & build gallery
Change-Id: Ia683892900f78362fd66acc7189a57b0e51a4517
---
 .../spa/framework/common/SettingsPageProvider.kt            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt
index 151b50cdb5c4b..60599d49968ff 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SettingsPageProvider.kt
@@ -30,14 +30,14 @@ interface SettingsPageProvider {
     val name: String
 
     /** The display name of this page provider, for better readability. */
-    val displayName: String?
-        get() = null
+    val displayName: String
+        get() = name
 
     /** The page parameters, default is no parameters. */
     val parameter: List<NamedNavArgument>
         get() = emptyList()
 
-    fun getTitle(arguments: Bundle?): String = displayName ?: name
+    fun getTitle(arguments: Bundle?): String = displayName
 
     fun buildEntry(arguments: Bundle?): List<SettingsEntry> = emptyList()