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

Commit 7573d000 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid running RegisteredServicesCache tasks on main thread" into sc-dev am: 2f74b666 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I858c3692e28be54b0d17b257e887380bbe78d700
parents 43926635 2f74b666

core/java/android/content/pm/RegisteredServicesCache.java

+7 −4
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.util.Xml; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.BackgroundThread;

import com.android.internal.util.ArrayUtils;



import libcore.io.IoUtils;
@@ -161,18 +162,20 @@ public abstract class RegisteredServicesCache<V> { 
        intentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);

        intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);

        intentFilter.addDataScheme("package");

        mContext.registerReceiverAsUser(mPackageReceiver, UserHandle.ALL, intentFilter, null, null);

        Handler handler = BackgroundThread.getHandler();

        mContext.registerReceiverAsUser(

                mPackageReceiver, UserHandle.ALL, intentFilter, null, handler);



        // Register for events related to sdcard installation.

        IntentFilter sdFilter = new IntentFilter();

        sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE);

        sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);

        mContext.registerReceiver(mExternalReceiver, sdFilter);

        mContext.registerReceiver(mExternalReceiver, sdFilter, null, handler);



        // Register for user-related events

        IntentFilter userFilter = new IntentFilter();

        sdFilter.addAction(Intent.ACTION_USER_REMOVED);

        mContext.registerReceiver(mUserRemovedReceiver, userFilter);

        mContext.registerReceiver(mUserRemovedReceiver, userFilter, null, handler);

    }



    private void handlePackageEvent(Intent intent, int userId) {
@@ -265,7 +268,7 @@ public abstract class RegisteredServicesCache<V> { 


    public void setListener(RegisteredServicesCacheListener<V> listener, Handler handler) {

        if (handler == null) {

            handler = new Handler(mContext.getMainLooper());

            handler = BackgroundThread.getHandler();

        }

        synchronized (this) {

            mHandler = handler;

services/core/java/com/android/server/accounts/AccountManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ public class AccountManagerService 
        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);

        mHandler = new MessageHandler(injector.getMessageHandlerLooper());

        mAuthenticatorCache = mInjector.getAccountAuthenticatorCache();

        mAuthenticatorCache.setListener(this, null /* Handler */);

        mAuthenticatorCache.setListener(this, mHandler);



        sThis.set(this);