commit e5aa05d12a48f7c5766a80d5bd2dc8cd068c1bcd
author Jerry Zhang <zhangjerry@google.com> Fri Oct 13 12:14:42 2017 -0700
committer Jerry Zhang <zhangjerry@google.com> Fri Dec 15 00:08:44 2017 +0000
tree 7dd4c8dfd8429a55c5aa56bc8d55a3e7139bacee
parent e5b50aeedba87b11b278105cc42343691a5b9e2f

MtpServer changes for MtpStorageManager

MoveObject and DeleteObject require
begin() and end() methods in order to
maintain database consistency. delete() now
has to return errors.

Allow sendObject after sendObjectInfo since
the spec allows this.

Test: See tests for main MtpStorageManager change
Bug: 63143623
Change-Id: Ied105e884cafd36e861521dcc59740e23b330f5f

media/mtp/MtpServer.h

diff --git a/media/mtp/MtpServer.h b/media/mtp/MtpServer.h
index 0204b09..af371eb 100644
--- a/media/mtp/MtpServer.h
+++ b/media/mtp/MtpServer.h
@@ -32,13 +32,13 @@
 
 namespace android {
 
-class MtpDatabase;
+class IMtpDatabase;
 class MtpStorage;
 
 class MtpServer {
 
 private:
-    MtpDatabase*        mDatabase;
+    IMtpDatabase*       mDatabase;
 
     // appear as a PTP device
     bool                mPtp;
@@ -98,7 +98,7 @@
     Vector<ObjectEdit*>  mObjectEditList;
 
 public:
-                        MtpServer(MtpDatabase* database, bool ptp,
+                        MtpServer(IMtpDatabase* database, bool ptp,
                                     const MtpString& deviceInfoManufacturer,
                                     const MtpString& deviceInfoModel,
                                     const MtpString& deviceInfoDeviceVersion,