Legacy MountService: Update binder interface to match MountService

Signed-off-by: San Mehat <san@google.com>

2 files changed, 23 insertions, 32 deletions

diff --git a/include/hardware_legacy/IMountService.h b/include/hardware_legacy/IMountService.h
index 7c5e612..cb1f505 100644
--- a/include/hardware_legacy/IMountService.h
+++ b/include/hardware_legacy/IMountService.h
@@ -70,24 +70,14 @@ public:
      */
     virtual void setPlayNotificationSounds(bool enabled) = 0;
 
-    /**
-     * Returns true if USB Mass Storage is automatically started
-     * when a UMS host is detected.
-     */
-    virtual bool getAutoStartUms() = 0;
-
-    /*
-     * Sets whether or not USB Mass Storage is automatically started
-     * when a UMS host is detected.
-     */
-    virtual void setAutoStartUms(bool autostart) = 0;
-
     virtual String16 getVolumeState(String16 mountPoint) = 0;
     virtual String16 createSecureCache(String16 id, int sizeMb, String16 fstype, String16 key, int ownerUid) = 0;
     virtual void finalizeSecureCache(String16 id) = 0;
     virtual void destroySecureCache(String16 id) = 0;
     virtual String16 mountSecureCache(String16 id, String16 key, int ownerUid) = 0;
     virtual String16 getSecureCachePath(String16 id) = 0;
+    virtual void getSecureCacheList() = 0;
+    virtual void shutdown() = 0;
 };
 
 // ----------------------------------------------------------------------
diff --git a/mount/IMountService.cpp b/mount/IMountService.cpp
index 14ba940..dc4c8b4 100644
--- a/mount/IMountService.cpp
+++ b/mount/IMountService.cpp
@@ -32,14 +32,14 @@ enum {
     FORMAT_MEDIA_TRANSACTION,
     GET_PLAY_NOTIFICATION_SOUNDS_TRANSACTION,
     SET_PLAY_NOTIFICATION_SOUNDS_TRANSACTION,
-    GET_AUTOSTART_UMS_TRANSACTION,
-    SET_AUTOSTART_UMS_TRANSACTION,
     GET_VOLUME_STATE_TRANSACTION,
     CREATE_SECURE_CACHE_TRANSACTION,
     FINALIZE_SECURE_CACHE_TRANSACTION,
     DESTROY_SECURE_CACHE_TRANSACTION,
     MOUNT_SECURE_CACHE_TRANSACTION,
-    GET_SECURE_CACHE_PATH_TRANSACTION
+    GET_SECURE_CACHE_PATH_TRANSACTION,
+    GET_SECURE_CACHE_LIST_TRANSACTION,
+    SHUTDOWN_TRANSACTION,
 };    
 
 class BpMountService : public BpInterface<IMountService>
@@ -117,23 +117,6 @@ public:
         remote()->transact(SET_PLAY_NOTIFICATION_SOUNDS_TRANSACTION, data, &reply);
     }
 
-    virtual bool getAutoStartUms()
-    {
-        uint32_t n;
-        Parcel data, reply;
-        data.writeInterfaceToken(IMountService::getInterfaceDescriptor());
-        remote()->transact(GET_AUTOSTART_UMS_TRANSACTION, data, &reply);
-        return reply.readInt32();
-    }
-
-    virtual void setAutoStartUms(bool enabled)
-    {
-        Parcel data, reply;
-        data.writeInterfaceToken(IMountService::getInterfaceDescriptor());
-        data.writeInt32(enabled ? 1 : 0);
-        remote()->transact(SET_AUTOSTART_UMS_TRANSACTION, data, &reply);
-    }
-
     virtual String16 getVolumeState(String16 mountPoint)
     {
         uint32_t n;
@@ -194,6 +177,24 @@ public:
         remote()->transact(GET_SECURE_CACHE_PATH_TRANSACTION, data, &reply);
         return reply.readString16();
     }
+
+    virtual void getSecureCacheList()
+    {
+        uint32_t n;
+        Parcel data, reply;
+        data.writeInterfaceToken(IMountService::getInterfaceDescriptor());
+        remote()->transact(GET_SECURE_CACHE_LIST_TRANSACTION, data, &reply);
+        return;
+    }
+
+    virtual void shutdown()
+    {
+        uint32_t n;
+        Parcel data, reply;
+        data.writeInterfaceToken(IMountService::getInterfaceDescriptor());
+        remote()->transact(SHUTDOWN_TRANSACTION, data, &reply);
+        return;
+    }
 };
 
 IMPLEMENT_META_INTERFACE(MountService, "android.os.IMountService");