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

Commit 49d6d560 authored by Tony Mak's avatar Tony Mak Committed by Android (Google) Code Review
Browse files

Merge "Fix the issue that SettingsProvider sees mismatched calling uid and pkg"

parents 004e36da 504c98ca

services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -669,7 +669,8 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
                return mDefaultServiceState;

            }

            String textClassifierServicePackageOverride =

                    mSettings.getTextClassifierServicePackageOverride();

                    Binder.withCleanCallingIdentity(

                            mSettings::getTextClassifierServicePackageOverride);

            if (!TextUtils.isEmpty(textClassifierServicePackageOverride)) {

                if (textClassifierServicePackageOverride.equals(mDefaultTextClassifierPackage)) {

                    return mDefaultServiceState;