diff options
| author | 2023-06-21 11:47:17 +0000 | |
|---|---|---|
| committer | 2023-06-21 11:47:17 +0000 | |
| commit | 62f8301744ed1be4354722c35f7a7d69c0f98e80 (patch) | |
| tree | beef74b57a5f20312b2603291bb183a92dc0f539 | |
| parent | 7c0ba90d74957cc4b7d3c93a4c36034cca93a4a2 (diff) | |
| parent | 4ced56ad262af6ec4a712b28eb6e2f874dcba075 (diff) | |
Merge "Don't create copies of Icon bitmaps for Smartspace" into udc-dev am: 8984c11c95 am: 4ced56ad26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23709088
Change-Id: I05d1546988b2f8e4faa5a16e5f08075520ee1435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/smartspace/SmartspaceAction.java | 4 | ||||
| -rw-r--r-- | core/java/android/app/smartspace/uitemplatedata/Icon.java | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/smartspace/SmartspaceAction.java b/core/java/android/app/smartspace/SmartspaceAction.java index f17b044f7996..4475fc56b92d 100644 --- a/core/java/android/app/smartspace/SmartspaceAction.java +++ b/core/java/android/app/smartspace/SmartspaceAction.java @@ -348,6 +348,10 @@ public final class SmartspaceAction implements Parcelable { */ @NonNull public SmartspaceAction build() { + if (mIcon != null) { + mIcon.convertToAshmem(); + } + return new SmartspaceAction(mId, mIcon, mTitle, mSubtitle, mContentDescription, mPendingIntent, mIntent, mUserHandle, mExtras); } diff --git a/core/java/android/app/smartspace/uitemplatedata/Icon.java b/core/java/android/app/smartspace/uitemplatedata/Icon.java index 6bdc926e7cf3..b9d90bfdb6e4 100644 --- a/core/java/android/app/smartspace/uitemplatedata/Icon.java +++ b/core/java/android/app/smartspace/uitemplatedata/Icon.java @@ -171,6 +171,7 @@ public final class Icon implements Parcelable { */ @NonNull public Icon build() { + mIcon.convertToAshmem(); return new Icon(mIcon, mContentDescription, mShouldTint); } } |