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

Merge "Don't create copies of Icon bitmaps for Smartspace" into udc-dev am: 8984c11c95

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23709088

Change-Id: I81fc2b589b5caabe77ad4bbe78a900a4868be25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-21 10:58:15 +00:00
committed by Automerger Merge Worker
parent 47912d2704 8984c11c95
commit d776f27902
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/smartspace/SmartspaceAction.java
View File

@@ -348,6 +348,10 @@ public final class SmartspaceAction implements Parcelable {
*/ */
@NonNull @NonNull
public SmartspaceAction build() { public SmartspaceAction build() {
if (mIcon != null) {
mIcon.convertToAshmem();
}
return new SmartspaceAction(mId, mIcon, mTitle, mSubtitle, mContentDescription, return new SmartspaceAction(mId, mIcon, mTitle, mSubtitle, mContentDescription,
mPendingIntent, mIntent, mUserHandle, mExtras); mPendingIntent, mIntent, mUserHandle, mExtras);
} }

1
core/java/android/app/smartspace/uitemplatedata/Icon.java
View File

@@ -171,6 +171,7 @@ public final class Icon implements Parcelable {
*/ */
@NonNull @NonNull
public Icon build() { public Icon build() {
mIcon.convertToAshmem();
return new Icon(mIcon, mContentDescription, mShouldTint); return new Icon(mIcon, mContentDescription, mShouldTint);
} }
} }