Merge "Remove manual pregrants for SystemCaptionsService (handled via roles)" into tm-dev am: 6cdd16d9c3
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:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user