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

Commit 0f4664c9 authored by Justin Lannin's avatar Justin Lannin
Browse files

DevicePolicyManagerService: Add health permissions to restricted list. 

Bug: 388336404
Change-Id: I7de34a90f4b75b432211c754194643bb66fad22d
Flag: android.permission.flags.replace_body_sensor_permission_enabled
parent 6677ac19

core/java/android/app/admin/DevicePolicyManager.java

+3 −0
Original line number Diff line number Diff line
@@ -14200,6 +14200,9 @@ public class DevicePolicyManager { 
     *    <li>Manifest.permission.ACTIVITY_RECOGNITION</li>

     *    <li>Manifest.permission.BODY_SENSORS</li>

     * </ul>

     * On devices running {@link android.os.Build.VERSION_CODES#BAKLAVA}, the

     * {@link android.health.connect.HealthPermissions} are also included in the

     * restricted list.

     * <p>

     * A profile owner may not grant these permissions (i.e. call this method with any of the

     * permissions listed above and {@code grantState} of {@code #PERMISSION_GRANT_STATE_GRANTED}),

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+9 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ import android.database.ContentObserver; 
import android.database.Cursor;

import android.graphics.Bitmap;

import android.hardware.usb.UsbManager;

import android.health.connect.HealthConnectManager;

import android.location.Location;

import android.location.LocationManager;

import android.media.AudioManager;
@@ -2149,6 +2150,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                .hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);

        mBackgroundHandler = BackgroundThread.getHandler();













        // Add the health permission to the list of restricted permissions.













        if (android.permission.flags.Flags.replaceBodySensorPermissionEnabled()) {













            Set<String> healthPermissions = HealthConnectManager.getHealthPermissions(mContext);













            for (String permission : healthPermissions) {













                SENSOR_PERMISSIONS.add(permission);













            }













        }



























        // Needed when mHasFeature == false, because it controls the certificate warning text.















        mCertificateMonitor = new CertificateMonitor(this, mInjector, mBackgroundHandler);







































services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -262,6 +262,11 @@ public class DpmMockContext extends MockContext {













        return realTestContext.getSystemServiceName(serviceClass);















    }





























    @Override













    public Context getApplicationContext() {













        return this;













    }





























    @Override















    public PackageManager getPackageManager() {















        return mMockSystemServices.packageManager;