From dde25397985d82352965c54d68c0ee181b2c3cc8 Mon Sep 17 00:00:00 2001
From: San Mehat <san@google.com>
Date: Thu, 7 Jan 2010 11:33:29 -0800
Subject: [PATCH] MountService: Remove ACTION_SHUTDOWN handler

   Shutdown handlers run too early for unmounting, so don't handle it.
Shutdown will be called explicitly from the ShutdownThread

Signed-off-by: San Mehat <san@google.com>
---
 services/java/com/android/server/MountService.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java
index 386dc0a175cda..473cc7a598edd 100644
--- a/services/java/com/android/server/MountService.java
+++ b/services/java/com/android/server/MountService.java
@@ -115,8 +115,6 @@ class MountService extends IMountService.Stub {
         // start processing events before we ought-to
         mContext.registerReceiver(mBroadcastReceiver,
                 new IntentFilter(Intent.ACTION_BOOT_COMPLETED), null, null);
-        mContext.registerReceiver(mBroadcastReceiver,
-                new IntentFilter(Intent.ACTION_SHUTDOWN), null, null);
 
         mListener =  new MountListener(this);       
         mShowSafeUnmountNotificationWhenUnmounted = false;
@@ -133,8 +131,6 @@ class MountService extends IMountService.Stub {
             if (action.equals(Intent.ACTION_BOOT_COMPLETED)) {
                 Thread thread = new Thread(mListener, MountListener.class.getName());
                 thread.start();
-            } else if (action.equals(Intent.ACTION_SHUTDOWN)) {
-                shutdown();
             }
         }
     };