diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 592afa7012b59..d074eeb5f6679 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4418,4 +4418,7 @@
+
+
+
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 8cd4b48a0181f..996e1f9fde9a1 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -4067,4 +4067,5 @@
+
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SettingsSidecarImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SettingsSidecarImpl.java
index ca3a5112bc55f..5397302f6882a 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SettingsSidecarImpl.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SettingsSidecarImpl.java
@@ -37,6 +37,8 @@ import android.util.Log;
import androidx.annotation.NonNull;
+import com.android.internal.R;
+
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
@@ -151,13 +153,18 @@ class SettingsSidecarImpl extends StubSidecar {
return features;
}
- ContentResolver resolver = mContext.getContentResolver();
- final String displayFeaturesString = Settings.Global.getString(resolver, DISPLAY_FEATURES);
if (isInMultiWindow(windowToken)) {
// It is recommended not to report any display features in multi-window mode, since it
// won't be possible to synchronize the display feature positions with window movement.
return features;
}
+
+ ContentResolver resolver = mContext.getContentResolver();
+ String displayFeaturesString = Settings.Global.getString(resolver, DISPLAY_FEATURES);
+ if (TextUtils.isEmpty(displayFeaturesString)) {
+ displayFeaturesString = mContext.getResources().getString(
+ R.string.config_display_features);
+ }
if (TextUtils.isEmpty(displayFeaturesString)) {
return features;
}