diff options
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/textclassifier/IconsContentProvider.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4bc570ad0adb..d4cc636ec60b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -5477,13 +5477,14 @@ <service android:name="com.android.server.pm.PackageManagerShellCommandDataLoader" android:exported="false"> <intent-filter> - <action android:name="android.intent.action.LOAD_DATA" /> + <action android:name="android.intent.action.LOAD_DATA"/> </intent-filter> </service> <provider android:name="com.android.server.textclassifier.IconsContentProvider" android:authorities="com.android.textclassifier.icons" + android:singleUser="true" android:enabled="true" android:exported="true"> </provider> diff --git a/services/core/java/com/android/server/textclassifier/IconsContentProvider.java b/services/core/java/com/android/server/textclassifier/IconsContentProvider.java index d19a707770e2..9b3176d9df67 100644 --- a/services/core/java/com/android/server/textclassifier/IconsContentProvider.java +++ b/services/core/java/com/android/server/textclassifier/IconsContentProvider.java @@ -25,6 +25,7 @@ import android.graphics.drawable.Icon; import android.net.Uri; import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor.AutoCloseOutputStream; +import android.os.UserHandle; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -51,7 +52,7 @@ public final class IconsContentProvider extends ContentProvider { try { final ResourceInfo res = IconsUriHelper.getInstance().getResourceInfo(uri); final Drawable drawable = Icon.createWithResource(res.packageName, res.id) - .loadDrawable(getContext()); + .loadDrawableAsUser(getContext(), UserHandle.getCallingUserId()); final byte[] data = getBitmapData(drawable); final ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe(); final ParcelFileDescriptor readSide = pipe[0]; |