Merge cherrypicks of [6038700, 6038701, 6041464] into qt-release

Change-Id: Ic9b28392d165140376ef8f494e501f221c2aa115
This commit is contained in:
android-build-team Robot
2019-01-14 23:49:39 +00:00

View File

@@ -369,6 +369,11 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
mPreferenceControllers.values()) {
for (AbstractPreferenceController controller : controllerList) {
final String key = controller.getPreferenceKey();
if(TextUtils.isEmpty(key)) {
Log.d(TAG, String.format("Preference key is %s in Controller %s",
key, controller.getClass().getSimpleName()));
continue;
}
final Preference preference = screen.findPreference(key);
if (preference != null) {
preference.setVisible(visible && controller.isAvailable());