diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-01-31 16:44:44 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-01-31 17:11:24 -0500 |
| commit | 8d08c5aeee05425357b6603a22fa73fd6e095a47 (patch) | |
| tree | e3f9b8aef2c2f1b1564d177b1b828edcf15e691b /media | |
| parent | 1331f07d4400a25b9c8d2d4a1a913150ae05c5f7 (diff) | |
| download | frameworks_av-8d08c5aeee05425357b6603a22fa73fd6e095a47.zip frameworks_av-8d08c5aeee05425357b6603a22fa73fd6e095a47.tar.gz frameworks_av-8d08c5aeee05425357b6603a22fa73fd6e095a47.tar.bz2 | |
MTP: Use ro.product.manufacturer system property value for MTP manufacturer name
Previously it was hard coded to "Google, Inc."
BUG: 3405965
Change-Id: I5f962d474814c22e990c39b501c0f01da9e8dc6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media')
| -rw-r--r-- | media/mtp/MtpServer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index be004d2..853a5af 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -343,8 +343,9 @@ MtpResponseCode MtpServer::doGetDeviceInfo() { mData.putAUInt16(deviceProperties); // Device Properties Supported mData.putAUInt16(captureFormats); // Capture Formats mData.putAUInt16(playbackFormats); // Playback Formats - // FIXME - string.set("Google, Inc."); + + property_get("ro.product.manufacturer", prop_value, "unknown manufacturer"); + string.set(prop_value); mData.putString(string); // Manufacturer property_get("ro.product.model", prop_value, "MTP Device"); |