commit e92bd4c04bcb0d18c0fdae9246f4af06a5aba345
author Jeff Sharkey <jsharkey@android.com> Fri Oct 24 17:42:53 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 24 17:42:53 2014 +0000
tree 22190ce827d78dbf502a7e2589ef25cab43107c4
parent 0fcddd513868918215e889db07cdca126f942d89
parent 2d87ba630cdcb6695582c655e6fc091115ffea38

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

* commit '2d87ba630cdcb6695582c655e6fc091115ffea38':
  Allow I/O when installing providers.

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index dd49009..fa15ad7 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2513,7 +2513,12 @@
     }
 
     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) {