am 2d87ba63: Merge "Allow I/O when installing providers." into lmp-mr1-dev

* commit '2d87ba630cdcb6695582c655e6fc091115ffea38': Allow I/O when installing providers.
2014-10-24 17:42:53 +00:00
parent 0fcddd5138 2d87ba630c
commit e92bd4c04b
1 changed files with 6 additions and 1 deletions
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2513,7 +2513,12 @@ public final class ActivityThread {
    }

    public void handleInstallProvider(ProviderInfo info) {
-        installContentProviders(mInitialApplication, Lists.newArrayList(info));
+        final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
+        try {
+            installContentProviders(mInitialApplication, Lists.newArrayList(info));
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
+        }
    }

    private void handleEnterAnimationComplete(IBinder token) {