From 240b7af5859b89d832d7232482a2bda7ffe26ef5 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 11 Jun 2021 23:54:50 +0530 Subject: [PATCH] Read additional_repos.xml from /product as well Change-Id: Id4a99204e4be467f4e3b1d6684eeb86a19a614f2 --- app/src/main/java/org/fdroid/fdroid/data/DBHelper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java index 771a2ba7e..7ab4ed480 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java @@ -322,16 +322,16 @@ public class DBHelper extends SQLiteOpenHelper { /** * Look for additional, initial repositories from the device's filesystem. - * These can be added as part of the ROM ({@code /system} or included later - * by vendors/OEMs ({@code /vendor}, {@code /odm}, {@code /oem}). These are - * always added at a lower priority than the repos embedded in the APK via + * These can be added as part of the ROM ({@code /system} or {@code /product} + * or included later by vendors/OEMs ({@code /vendor}, {@code /odm}, {@code /oem}). + * These are always added at a lower priority than the repos embedded in the APK via * {@code default_repos.xml}. *

- * ROM has the lowest priority, then Vendor, ODM, and OEM. + * ROM (System) has the lowest priority, then Product, Vendor, ODM, and OEM. */ private static List loadAdditionalRepos(String packageName) { List repoItems = new LinkedList<>(); - for (String root : Arrays.asList("/system", "/vendor", "/odm", "/oem")) { + for (String root : Arrays.asList("/system", "/product", "/vendor", "/odm", "/oem")) { File additionalReposFile = new File(root + "/etc/" + packageName + "/additional_repos.xml"); try { if (additionalReposFile.isFile()) {