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

Commit b3a9ae82 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Scan permissions from /product-services/etc/."

parents 47ee2918 1ae46d72

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+5 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.app.ActivityManager; 
import android.app.DownloadManager;

import android.app.admin.DevicePolicyManager;

import android.companion.CompanionDeviceManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;
@@ -54,7 +53,6 @@ import android.provider.ContactsContract; 
import android.provider.MediaStore;

import android.provider.Telephony.Sms.Intents;

import android.security.Credentials;

import android.service.textclassifier.TextClassifierService;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.ArrayMap;
@@ -1399,6 +1397,11 @@ public final class DefaultPermissionGrantPolicy { 
        if (dir.isDirectory() && dir.canRead()) {

            Collections.addAll(ret, dir.listFiles());

        }

        dir = new File(Environment.getProductServicesDirectory(),

                "etc/default-permissions");

        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");