Merge partner customisations only if any are declared.
Change-Id: I5c9777694dd02454dd4458f6eb3e5a77603faca5
diff --git a/Settings/src/com/android/tv/settings/customization/PartnerPreferencesMerger.java b/Settings/src/com/android/tv/settings/customization/PartnerPreferencesMerger.java
index 5b26197..a5d1f17 100644
--- a/Settings/src/com/android/tv/settings/customization/PartnerPreferencesMerger.java
+++ b/Settings/src/com/android/tv/settings/customization/PartnerPreferencesMerger.java
@@ -58,11 +58,18 @@
*/
final PartnerResourcesParser partnerResourcesParser = new PartnerResourcesParser(
context, settingsScreen);
- for (final Preference newPartnerPreference : partnerResourcesParser.buildPreferences()) {
+ final List<Preference> partnerPreferences = partnerResourcesParser.buildPreferences();
+ final String[] orderedPreferenceKeys = partnerResourcesParser.getOrderedPreferences();
+
+ // Don't touch this screen if our partner hasn't asked to.
+ if (partnerPreferences.isEmpty() && orderedPreferenceKeys.length == 0) {
+ return;
+ }
+
+ for (final Preference newPartnerPreference : partnerPreferences) {
preferenceScreen.addPreference(newPartnerPreference);
}
- final String[] orderedPreferenceKeys = partnerResourcesParser.getOrderedPreferences();
// Clone the existing tv settings PreferenceScreen. All the preferences
// will be removed from this screen to avoid multiple re-orderings as
