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

Commit ec43d2d6 authored by Ye Wen's avatar Ye Wen Committed by android-build-merger
Browse files

Merge "Fix default permission granting for system TextClassifier." into pi-dev 

am: 07b79131

Change-Id: Ib8a69e230c5e15928f5d2248262f02860b2e4916
parents 8932ba58 07b79131

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

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

import android.service.textclassifier.TextClassifierService;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Log;
@@ -829,13 +830,11 @@ public final class DefaultPermissionGrantPolicy { 
        }



        // TextClassifier Service

        ComponentName textClassifierComponent =

                TextClassifierService.getServiceComponentName(mContext);

        if (textClassifierComponent != null) {

            Intent textClassifierServiceIntent = new Intent(TextClassifierService.SERVICE_INTERFACE)

                    .setComponent(textClassifierComponent);

        String textClassifierPackageName =

                mContext.getPackageManager().getSystemTextClassifierPackageName();

        if (!TextUtils.isEmpty(textClassifierPackageName)) {

            PackageParser.Package textClassifierPackage =

                    getDefaultSystemHandlerServicePackage(textClassifierServiceIntent, userId);

                    getSystemPackage(textClassifierPackageName);

            if (textClassifierPackage != null

                    && doesPackageSupportRuntimePermissions(textClassifierPackage)) {

                grantRuntimePermissions(textClassifierPackage, PHONE_PERMISSIONS, true, userId);