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

Commit 5bf271a3 authored by Nikita Dubrovsky's avatar Nikita Dubrovsky Committed by Automerger Merge Worker
Browse files

Merge "Remove manual pregrants for SystemCaptionsService (handled via roles)"... 

Merge "Remove manual pregrants for SystemCaptionsService (handled via roles)" into tm-dev am: 6cdd16d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17411107



Change-Id: Iaa075470e74eb5e2d1339edfec9cdec3da619c33
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ab1c7a5 6cdd16d9

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

+0 −9
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import android.provider.Telephony.Sms.Intents; 
import android.security.Credentials;

import android.speech.RecognitionService;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Log;
@@ -913,14 +912,6 @@ final class DefaultPermissionGrantPolicy { 
        grantSystemFixedPermissionsToSystemPackage(pm, "com.android.sharedstoragebackup", userId,

                STORAGE_PERMISSIONS);



        // System Captions Service

        String systemCaptionsServicePackageName =

                mContext.getPackageManager().getSystemCaptionsServicePackageName();

        if (!TextUtils.isEmpty(systemCaptionsServicePackageName)) {

            grantPermissionsToSystemPackage(pm, systemCaptionsServicePackageName, userId,

                    MICROPHONE_PERMISSIONS);

        }



        // Bluetooth MIDI Service

        grantSystemFixedPermissionsToSystemPackage(pm,

                MidiManager.BLUETOOTH_MIDI_SERVICE_PACKAGE, userId,