Make users of MtpServer provide DeviceInfo fields
This is part of weaning apps off accessing system identifiers via
system properties API. Apps should use android.os.Build API instead.
Bug: 33700679
Test: Enable MTP mode then check that mtp-detect output same as before this commit
Change-Id: Ic21da7b8e976aaa1abc606a3cb4a1f2bd8698408
diff --git a/media/mtp/MtpServer.h b/media/mtp/MtpServer.h
index c80e6a8..64d1b72 100644
--- a/media/mtp/MtpServer.h
+++ b/media/mtp/MtpServer.h
@@ -49,6 +49,15 @@
int mFilePermission;
int mDirectoryPermission;
+ // Manufacturer to report in DeviceInfo
+ MtpString mDeviceInfoManufacturer;
+ // Model to report in DeviceInfo
+ MtpString mDeviceInfoModel;
+ // Device version to report in DeviceInfo
+ MtpString mDeviceInfoDeviceVersion;
+ // Serial number to report in DeviceInfo
+ MtpString mDeviceInfoSerialNumber;
+
// current session ID
MtpSessionID mSessionID;
// true if we have an open session and mSessionID is valid
@@ -95,7 +104,11 @@
public:
MtpServer(MtpDatabase* database, bool ptp,
- int fileGroup, int filePerm, int directoryPerm);
+ int fileGroup, int filePerm, int directoryPerm,
+ const MtpString& deviceInfoManufacturer,
+ const MtpString& deviceInfoModel,
+ const MtpString& deviceInfoDeviceVersion,
+ const MtpString& deviceInfoSerialNumber);
virtual ~MtpServer();
MtpStorage* getStorage(MtpStorageID id);