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

Commit 99f4c7d0 authored by Chris Wren's avatar Chris Wren Committed by Dan Sandler
Browse files

Invalidate the people cache on Contacts provider changes. 

The Contacts database only seem to notify that a change has happened, not
which row was changed.  We simply invalidate the whole cache on changes.

Added an info log for even 100th invalidation, so we can see how often it happens.

Bug: 17466975
Change-Id: I9988ea8db776c88afd835a4b3c50b9a982a309d0
parent 37ccf18b

services/core/java/com/android/server/notification/ValidateNotificationPeople.java

+21 −0
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ package com.android.server.notification; 
import android.app.Notification;

import android.content.Context;

import android.content.pm.PackageManager;

import android.database.ContentObserver;

import android.database.Cursor;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.ContactsContract;

import android.provider.ContactsContract.Contacts;
@@ -75,6 +77,9 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { 
    // maps raw person handle to resolved person object

    private LruCache<String, LookupResult> mPeopleCache;

    private Map<Integer, Context> mUserToContextMap;

    private Handler mHandler;

    private ContentObserver mObserver;

    private int mEvictionCount;



    public void initialize(Context context) {

        if (DEBUG) Slog.d(TAG, "Initializing  " + getClass().getSimpleName() + ".");
@@ -83,6 +88,22 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { 
        mPeopleCache = new LruCache<String, LookupResult>(PEOPLE_CACHE_SIZE);

        mEnabled = ENABLE_PEOPLE_VALIDATOR && 1 == Settings.Global.getInt(

                mBaseContext.getContentResolver(), SETTING_ENABLE_PEOPLE_VALIDATOR, 1);

        if (mEnabled) {

            mHandler = new Handler();

            mObserver = new ContentObserver(mHandler) {

                @Override

                public void onChange(boolean selfChange, Uri uri, int userId) {

                    super.onChange(selfChange, uri, userId);

                    if (DEBUG || mEvictionCount % 100 == 0) {

                        if (INFO) Slog.i(TAG, "mEvictionCount: " + mEvictionCount);

                    }

                    mPeopleCache.evictAll();

                    mEvictionCount++;

                }

            };

            mBaseContext.getContentResolver().registerContentObserver(Contacts.CONTENT_URI, true,

                    mObserver, UserHandle.USER_ALL);

        }

    }



    public RankingReconsideration process(NotificationRecord record) {