commit 792f244db4fb8da6ba24c9d930114ca90c0a2305
author Alex Klyubin <klyubin@google.com> Thu Dec 22 17:06:06 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 22 17:06:06 2016 +0000
tree 8dbd42351423a2c453c3c7307c859192802494ff
parent 7477c6a13a673f55804e587e95ddde27316b7008
parent da402f1b065f1ab06cabb3c8a8e0c5a4f9a77d55

Merge "Make MtpService fill in MTP DeviceInfo fields"

src/com/android/providers/media/MtpService.java

diff --git a/src/com/android/providers/media/MtpService.java b/src/com/android/providers/media/MtpService.java
index f9e7a7f..b178c6f 100644
--- a/src/com/android/providers/media/MtpService.java
+++ b/src/com/android/providers/media/MtpService.java
@@ -23,6 +23,7 @@
 import android.mtp.MtpDatabase;
 import android.mtp.MtpServer;
 import android.mtp.MtpStorage;
+import android.os.Build;
 import android.os.Environment;
 import android.os.IBinder;
 import android.os.UserHandle;
@@ -156,7 +157,19 @@
             Log.d(TAG, "starting MTP server in " + (mPtpMode ? "PTP mode" : "MTP mode"));
             mDatabase = new MtpDatabase(this, MediaProvider.EXTERNAL_VOLUME,
                     primary.getPath(), subdirs);
-            mServer = new MtpServer(mDatabase, mPtpMode);
+            String deviceSerialNumber = Build.SERIAL;
+            if (Build.UNKNOWN.equals(deviceSerialNumber)) {
+                deviceSerialNumber = "????????";
+            }
+            mServer =
+                    new MtpServer(
+                            mDatabase,
+                            mPtpMode,
+                            Build.MANUFACTURER, // MTP DeviceInfo: Manufacturer
+                            Build.MODEL,        // MTP DeviceInfo: Model
+                            "1.0",              // MTP DeviceInfo: Device Version
+                            deviceSerialNumber  // MTP DeviceInfo: Serial Number
+                            );
             mDatabase.setServer(mServer);
             if (!mMtpDisabled) {
                 addStorageDevicesLocked();