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

Commit e6a2f840 authored by Justin Lannin's avatar Justin Lannin Committed by Android (Google) Code Review
Browse files

Merge "DefaultPermissionGrantPolicy: Update pre-grants to use granular health... 

Merge "DefaultPermissionGrantPolicy: Update pre-grants to use granular health permissions for SENSORS." into main
parents a629a492 c5a0acc7

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

+9 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.content.pm.PackageManagerInternal; 
import android.content.pm.PermissionInfo;

import android.content.pm.ProviderInfo;

import android.content.pm.ResolveInfo;

import android.health.connect.HealthPermissions;

import android.media.RingtoneManager;

import android.media.midi.MidiManager;

import android.net.Uri;
@@ -48,6 +49,7 @@ import android.os.Process; 
import android.os.UserHandle;

import android.os.storage.StorageManager;

import android.permission.PermissionManager;

import android.permission.flags.Flags;

import android.print.PrintManager;

import android.provider.CalendarContract;

import android.provider.ContactsContract;
@@ -214,9 +216,14 @@ final class DefaultPermissionGrantPolicy { 


    private static final Set<String> SENSORS_PERMISSIONS = new ArraySet<>();

    static {

        if (Flags.replaceBodySensorPermissionEnabled()) {

            SENSORS_PERMISSIONS.add(HealthPermissions.READ_HEART_RATE);

            SENSORS_PERMISSIONS.add(HealthPermissions.READ_HEALTH_DATA_IN_BACKGROUND);

        } else {

            SENSORS_PERMISSIONS.add(Manifest.permission.BODY_SENSORS);

            SENSORS_PERMISSIONS.add(Manifest.permission.BODY_SENSORS_BACKGROUND);

        }

    }



    private static final Set<String> STORAGE_PERMISSIONS = new ArraySet<>();

    static {