From 968b2db0f479e040bfd3c202cc3372eaf4c0ec2d Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Thu, 1 Apr 2021 21:08:54 +0000 Subject: [PATCH] Revert "Avoid running RegisteredServicesCache tasks on main thread" This reverts commit 8f35d505babb6b60ec07aa84b1caa01524f808b2. Reason for revert: possibly b/184141588 Change-Id: I8c6262ec8ce5561f8d398a81492b6f5217dba834 --- .../android/content/pm/RegisteredServicesCache.java | 11 ++++------- .../server/accounts/AccountManagerService.java | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/core/java/android/content/pm/RegisteredServicesCache.java b/core/java/android/content/pm/RegisteredServicesCache.java index 7696cbe0b6316..7ecb11248d235 100644 --- a/core/java/android/content/pm/RegisteredServicesCache.java +++ b/core/java/android/content/pm/RegisteredServicesCache.java @@ -42,7 +42,6 @@ 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; @@ -162,20 +161,18 @@ public abstract class RegisteredServicesCache { intentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED); intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); intentFilter.addDataScheme("package"); - Handler handler = BackgroundThread.getHandler(); - mContext.registerReceiverAsUser( - mPackageReceiver, UserHandle.ALL, intentFilter, null, handler); + mContext.registerReceiverAsUser(mPackageReceiver, UserHandle.ALL, intentFilter, null, null); // 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, null, handler); + mContext.registerReceiver(mExternalReceiver, sdFilter); // Register for user-related events IntentFilter userFilter = new IntentFilter(); sdFilter.addAction(Intent.ACTION_USER_REMOVED); - mContext.registerReceiver(mUserRemovedReceiver, userFilter, null, handler); + mContext.registerReceiver(mUserRemovedReceiver, userFilter); } private void handlePackageEvent(Intent intent, int userId) { @@ -268,7 +265,7 @@ public abstract class RegisteredServicesCache { public void setListener(RegisteredServicesCacheListener listener, Handler handler) { if (handler == null) { - handler = BackgroundThread.getHandler(); + handler = new Handler(mContext.getMainLooper()); } synchronized (this) { mHandler = handler; diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 73755231c3bef..9930eac5cbd52 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -279,7 +279,7 @@ public class AccountManagerService mAppOpsManager = mContext.getSystemService(AppOpsManager.class); mHandler = new MessageHandler(injector.getMessageHandlerLooper()); mAuthenticatorCache = mInjector.getAccountAuthenticatorCache(); - mAuthenticatorCache.setListener(this, mHandler); + mAuthenticatorCache.setListener(this, null /* Handler */); sThis.set(this);