Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 622ccdc2 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MTP device: Read manufacturer name and serial number from system properties.



Change-Id: I8d1ad79f38aaaa50fa8899e6b614096af95fdf39
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 26b327c8
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@
#include <fcntl.h>
#include <errno.h>

#include <cutils/properties.h>

#include "MtpDebug.h"
#include "MtpServer.h"
#include "MtpStorage.h"
@@ -288,6 +290,7 @@ bool MtpServer::handleRequest() {

MtpResponseCode MtpServer::doGetDeviceInfo() {
    MtpStringBuffer   string;
    char prop_value[PROPERTY_VALUE_MAX];

    // fill in device info
    mData.putUInt16(MTP_STANDARD_VERSION);
@@ -306,11 +309,15 @@ MtpResponseCode MtpServer::doGetDeviceInfo() {
    // FIXME
    string.set("Google, Inc.");
    mData.putString(string);   // Manufacturer
    string.set("Just an Ordinary MTP Device");

    property_get("ro.product.model", prop_value, "MTP Device");
    string.set(prop_value);
    mData.putString(string);   // Model
    string.set("1.0");
    mData.putString(string);   // Device Version
    string.set("123456789012345678AA");

    property_get("ro.serialno", prop_value, "????????");
    string.set(prop_value);
    mData.putString(string);   // Serial Number

    return MTP_RESPONSE_OK;
+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ uint64_t MtpStorage::getFreeSpace() {
}

const char* MtpStorage::getDescription() const {
    return "Phone Storage";
    return "Device Storage";
}

bool MtpStorage::scanFiles() {