Merge "Fix some pages crash after importing AndroidX from build 5175906"

This commit is contained in:
TreeHugger Robot
2018-12-18 18:19:48 +00:00
committed by Android (Google) Code Review

View File

@@ -295,7 +295,13 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
if (!controller.isAvailable()) {
continue;
}
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) {