summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorKen Sumrall <ksumrall@android.com>2013-06-05 22:08:12 -0700
committerKen Sumrall <ksumrall@android.com>2013-06-05 22:08:12 -0700
commit025adc4457f54afed43bd5f9b73f80b96674a6b4 (patch)
treed7c171a577b418f8175c55ddd637c9a3c1dda6ad /services/java/com/android/server/SystemServer.java
parent83ad439c5e0f9b505bcc9a1cfbdd5ce4da1d8a7b (diff)
downloadframeworks_base-025adc4457f54afed43bd5f9b73f80b96674a6b4.zip
frameworks_base-025adc4457f54afed43bd5f9b73f80b96674a6b4.tar.gz
frameworks_base-025adc4457f54afed43bd5f9b73f80b96674a6b4.tar.bz2
Don't wait for the MountService to be ready when encrypting
The MountService will take 2 minutes to time out trying to get volume and asec lists from vold, because vold is busy encrypting and not listening to requests on its socket. So when encrypting, do not wait for it to be ready, as we don't have /data mounted anyhow. Change-Id: I45c1067b168231cbec7a0f577de2ff3b28dbac55
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
-rw-r--r--services/java/com/android/server/SystemServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 7c5959d..55f2a32 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -540,7 +540,7 @@ class ServerThread {
* AppWidget Provider. Make sure MountService is completely started
* first before continuing.
*/
- if (mountService != null) {
+ if (mountService != null && !onlyCore) {
mountService.waitForAsecScan();
}