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

2020-02-11 19:35:23 +00:00
parent 004e36da64 504c98ca56
commit 49d6d560af
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
+++ b/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
@@ -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;