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

Commit 481c92f5 authored by Jeff Nainaparampil's avatar Jeff Nainaparampil Committed by Automerger Merge Worker
Browse files

Merge "[People Service] Re-order clean-up to only occur once per shortcuts... 

Merge "[People Service] Re-order clean-up to only occur once per shortcuts update" into tm-qpr-dev am: 038e86d8

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



Change-Id: I6a3e007f6d19d86226668f22e174d28086356660
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 281aa083 038e86d8

services/people/java/com/android/server/people/data/DataManager.java

+8 −5
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ public class DataManager { 
    private final List<PeopleService.ConversationsListener> mConversationsListeners =

            new ArrayList<>(1);

    private final Handler mHandler;



    private ContentObserver mCallLogContentObserver;

    private ContentObserver mMmsSmsContentObserver;
@@ -1106,6 +1105,7 @@ public class DataManager { 
                @NonNull List<ShortcutInfo> shortcuts, @NonNull UserHandle user) {

            mInjector.getBackgroundExecutor().execute(() -> {

                PackageData packageData = getPackage(packageName, user.getIdentifier());

                boolean hasCachedShortcut = false;

                for (ShortcutInfo shortcut : shortcuts) {

                    if (ShortcutHelper.isConversationShortcut(

                            shortcut, mShortcutServiceInternal, user.getIdentifier())) {
@@ -1114,15 +1114,18 @@ public class DataManager { 
                                    ? packageData.getConversationInfo(shortcut.getId()) : null;

                            if (conversationInfo == null

                                    || !conversationInfo.isShortcutCachedForNotification()) {

                                // This is a newly cached shortcut. Clean up the existing cached

                                // shortcuts to ensure the cache size is under the limit.

                                cleanupCachedShortcuts(user.getIdentifier(),

                                        MAX_CACHED_RECENT_SHORTCUTS - 1);

                                hasCachedShortcut = true;

                            }

                        }

                        addOrUpdateConversationInfo(shortcut);

                    }

                }

                // Added at least one new conversation. Uncache older existing cached

                // shortcuts to ensure the cache size is under the limit.

                if (hasCachedShortcut) {

                    cleanupCachedShortcuts(user.getIdentifier(),

                            MAX_CACHED_RECENT_SHORTCUTS);

                }

            });

        }