From a113e9971a714f56e8d187742cc432add19b7d93 Mon Sep 17 00:00:00 2001
From: Varun Shah <varunshah@google.com>
Date: Mon, 12 Apr 2021 21:41:29 +0000
Subject: [PATCH] Don't hold the CPH lock while installing providers.

Bug: 182011291
Test: atest ContentProviderTest [all]
Change-Id: I0050d86d9eeca6ca50f625eb52a83e321212d0a1
---
 .../java/com/android/server/am/ContentProviderHelper.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/am/ContentProviderHelper.java b/services/core/java/com/android/server/am/ContentProviderHelper.java
index b44699bab0bb5..fb9f2dd58c58a 100644
--- a/services/core/java/com/android/server/am/ContentProviderHelper.java
+++ b/services/core/java/com/android/server/am/ContentProviderHelper.java
@@ -1206,10 +1206,10 @@ public class ContentProviderHelper {
             }
         }
 
+        if (providers != null) {
+            mService.mSystemThread.installSystemProviders(providers);
+        }
         synchronized (this) {
-            if (providers != null) {
-                mService.mSystemThread.installSystemProviders(providers);
-            }
             mSystemProvidersInstalled = true;
         }