Don't hold the CPH lock while installing providers.

Bug: 182011291 Test: atest ContentProviderTest [all] Change-Id: I0050d86d9eeca6ca50f625eb52a83e321212d0a1
2021-04-12 21:41:29 +00:00
parent 96ab6db65f
commit a113e9971a
1 changed files with 3 additions and 3 deletions
--- 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;
        }