Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 252a44e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Null check file.list() results."

parents 3bfef018 fdc5ac4c
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -40,12 +40,13 @@ public class ThemePreference extends ListPreference {
    @Override
    public void onAttached() {
        super.onAttached();
        File file = new File("/vendor/overlay");
        ArrayList<String> options = Lists.newArrayList(file.list());
        String def = SystemProperties.get("ro.boot.vendor.overlay.theme");
        if (TextUtils.isEmpty(def)) {
            def = getContext().getString(R.string.default_theme);
        }
        String[] fileList = new File("/vendor/overlay").list();
        ArrayList<String> options = fileList != null
                ? Lists.newArrayList(fileList) : new ArrayList<>();
        if (!options.contains(def)) {
            options.add(0, def);
        }