Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8608e36beeca45154d0da6639e72b4f889f6475c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nikita Dubrovsky
2022-05-13 01:32:55 +00:00
committed by Automerger Merge Worker
parent 61f4c2a3e1 6cdd16d9c3
commit 12e45ca132
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
View File

@@ -57,7 +57,6 @@ import android.provider.Telephony.Sms.Intents;
import android.security.Credentials; import android.security.Credentials;
import android.speech.RecognitionService; import android.speech.RecognitionService;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.Log; import android.util.Log;
@@ -913,14 +912,6 @@ final class DefaultPermissionGrantPolicy {
grantSystemFixedPermissionsToSystemPackage(pm, "com.android.sharedstoragebackup", userId, grantSystemFixedPermissionsToSystemPackage(pm, "com.android.sharedstoragebackup", userId,
STORAGE_PERMISSIONS); STORAGE_PERMISSIONS);
// System Captions Service
String systemCaptionsServicePackageName =
mContext.getPackageManager().getSystemCaptionsServicePackageName();
if (!TextUtils.isEmpty(systemCaptionsServicePackageName)) {
grantPermissionsToSystemPackage(pm, systemCaptionsServicePackageName, userId,
MICROPHONE_PERMISSIONS);
}
// Bluetooth MIDI Service // Bluetooth MIDI Service
grantSystemFixedPermissionsToSystemPackage(pm, grantSystemFixedPermissionsToSystemPackage(pm,
MidiManager.BLUETOOTH_MIDI_SERVICE_PACKAGE, userId, MidiManager.BLUETOOTH_MIDI_SERVICE_PACKAGE, userId,