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

Commit 33f3cd67 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Fix notification tests" into tm-qpr-dev am: 79cf8d64 

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



Change-Id: Iacaf775a80e36d067a3ef6190c8bfeca8d9d52d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cac8f259 79cf8d64

core/java/android/app/Notification.java

+2 −2
Original line number Diff line number Diff line
@@ -8468,8 +8468,8 @@ public class Notification implements Parcelable 
            }















            int maxAvatarSize = resources.getDimensionPixelSize(













                    isLowRam ? R.dimen.notification_person_icon_max_size













                            : R.dimen.notification_person_icon_max_size_low_ram);













                    isLowRam ? R.dimen.notification_person_icon_max_size_low_ram













                            : R.dimen.notification_person_icon_max_size);















            if (mUser != null && mUser.getIcon() != null) {















                mUser.getIcon().scaleDownIfNecessary(maxAvatarSize, maxAvatarSize);















            }

































core/tests/coretests/src/android/app/NotificationTest.java



+536
−29


























File changed.
Preview size limit exceeded, changes collapsed.
























services/tests/uiservicestests/src/com/android/server/notification/NotificationTest.java
deleted100644 → 0



+0
−551


























File deleted.
Preview size limit exceeded, changes collapsed.