Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf299ac5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Don't create copies of Icon bitmaps for Smartspace" into udc-dev am: 8984c11c am: 4ced56ad am: b0a1705f

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



Change-Id: Ie40f1a31c023fbcff4ab75fca30b4aa3bb5f411e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac2daaee b0a1705f

core/java/android/app/smartspace/SmartspaceAction.java

+4 −0
Original line number Diff line number Diff line
@@ -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);

        }

core/java/android/app/smartspace/uitemplatedata/Icon.java

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ public final class Icon implements Parcelable { 
         */

        @NonNull

        public Icon build() {

            mIcon.convertToAshmem();

            return new Icon(mIcon, mContentDescription, mShouldTint);

        }

    }