| commit | 9cca29f77701c3032c572cc8fc42fc21f18bcda9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Jun 18 14:13:43 2024 -0700 |
| committer | Xin Li <delphij@google.com> | Tue Jun 18 14:13:43 2024 -0700 |
| tree | 7f037e7a0baef079bb2a02e38f33c151a0c1cc1b | |
| parent | 5c8fbc5bac04f6ae8e7f8b965869ea1aaf2235c0 [diff] | |
| parent | a4680ca4dbb94dd94cc8f81cce8daa07fa6bf6e8 [diff] |
Merge 24Q3 (ab/11976889) to aosp-main-future Bug: 347831320 Merged-In: Ie8571e883132cfaa5a054cdcf4c3a827fa215014 Change-Id: I14e0b8ef0aca63213656000a155e395379b088c1
diff --git a/Android.bp b/Android.bp index 8c5e5ea..575ca5a 100644 --- a/Android.bp +++ b/Android.bp
@@ -245,6 +245,7 @@ android_app { name: "Dialer", + use_resource_processor: false, srcs: [ "java/com/android/**/*.java", "java/com/android/**/*.proto",
diff --git a/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java b/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java index f7f79e1..e0a04aa 100644 --- a/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java +++ b/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java
@@ -369,7 +369,7 @@ if (DEBUG) { LogUtil.d("ContactPhotoManagerImpl.onTrimMemory", "onTrimMemory: " + level); } - if (level >= ComponentCallbacks2.TRIM_MEMORY_MODERATE) { + if (level >= ComponentCallbacks2.TRIM_MEMORY_BACKGROUND) { // Clear the caches. Note all pending requests will be removed too. clear(); }