Merge "Move DataSourceUnwrapper to MidiIoWrapper class" am: e512cd3def am: 06e1900225 am: 869f4d73b6

Change-Id: Ifa10feda503d801556d6c0ac9f097415827708ab

media/libmedia/MidiIoWrapper.cpp

@@ -49,7 +49,7 @@ MidiIoWrapper::MidiIoWrapper(int fd, off64_t offset, int64_t size) {
     mDataSource = nullptr;
 }
 
-class DataSourceUnwrapper {
+class MidiIoWrapper::DataSourceUnwrapper {
 
 public:
     explicit DataSourceUnwrapper(CDataSource *csource) {

media/libmedia/include/media/MidiIoWrapper.h

@@ -22,7 +22,6 @@
 namespace android {
 
 struct CDataSource;
-class DataSourceUnwrapper;
 
 class MidiIoWrapper {
 public:
@@ -41,6 +40,7 @@ private:
     int mFd;
     off64_t mBase;
     int64_t  mLength;
+    class DataSourceUnwrapper;
     DataSourceUnwrapper *mDataSource;
     EAS_FILE mEasFile;
 };