Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix an issue that the icon rewritten logic not working in non-primary user" into rvc-dev am: 629a9d119b am: 1c60c56087

Browse Source 
Change-Id: Ibc14932180d0bc30b473d962e9b11b6feb167dc1
This commit is contained in:
Tony Mak
2020-05-20 14:53:54 +00:00
committed by Automerger Merge Worker
parent 65d31a3d32 1c60c56087
commit 6db5a8dc0f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/AndroidManifest.xml
View File

@@ -5484,6 +5484,7 @@
<provider <provider
android:name="com.android.server.textclassifier.IconsContentProvider" android:name="com.android.server.textclassifier.IconsContentProvider"
android:authorities="com.android.textclassifier.icons" android:authorities="com.android.textclassifier.icons"
android:singleUser="true"
android:enabled="true" android:enabled="true"
android:exported="true"> android:exported="true">
</provider> </provider>

3
services/core/java/com/android/server/textclassifier/IconsContentProvider.java
View File

@@ -25,6 +25,7 @@ import android.graphics.drawable.Icon;
import android.net.Uri; import android.net.Uri;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.ParcelFileDescriptor.AutoCloseOutputStream; import android.os.ParcelFileDescriptor.AutoCloseOutputStream;
import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
@@ -51,7 +52,7 @@ public final class IconsContentProvider extends ContentProvider {
try { try {
final ResourceInfo res = IconsUriHelper.getInstance().getResourceInfo(uri); final ResourceInfo res = IconsUriHelper.getInstance().getResourceInfo(uri);
final Drawable drawable = Icon.createWithResource(res.packageName, res.id) final Drawable drawable = Icon.createWithResource(res.packageName, res.id)
.loadDrawable(getContext()); .loadDrawableAsUser(getContext(), UserHandle.getCallingUserId());
final byte[] data = getBitmapData(drawable); final byte[] data = getBitmapData(drawable);
final ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe(); final ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
final ParcelFileDescriptor readSide = pipe[0]; final ParcelFileDescriptor readSide = pipe[0];