Merge "Don't hold the CPH lock while installing providers." into sc-dev

2021-04-13 02:58:47 +00:00
parent e2f123e1a4 a113e9971a
commit 4e974ce20d
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;
        }