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

Commit 25552607 authored by Jiyong Park's avatar Jiyong Park Committed by Gerrit Code Review
Browse files

Merge "Allow permission pre-grant files on OEM partition" into main

parents 2cdda47d 6ae8647e
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -1480,13 +1480,10 @@ final class DefaultPermissionGrantPolicy {
        if (dir.isDirectory() && dir.canRead()) {
            Collections.addAll(ret, dir.listFiles());
        }
        // For IoT devices, we check the oem partition for default permissions for each app.
        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_EMBEDDED, 0)) {
        dir = new File(Environment.getOemDirectory(), "etc/default-permissions");
        if (dir.isDirectory() && dir.canRead()) {
            Collections.addAll(ret, dir.listFiles());
        }
        }
        return ret.isEmpty() ? null : ret.toArray(new File[0]);
    }