commit a2a2128423309641a6b508a15404f3a7e8f3077b
author Mike Lockwood <lockwood@android.com> Sat Sep 25 21:21:05 2010 -0400
committer Mike Lockwood <lockwood@android.com> Sat Sep 25 21:21:05 2010 -0400
tree 1ec4b2d26286fdb427482d8d53135d111ccb7949
parent 564ff8432173545137ac8c658dac52306bc070be

MTP: Include current property value in GetDevicePropDesc

Change-Id: I05125c79ad58b6f75734fcedcc8af9b689fa9ff3
Signed-off-by: Mike Lockwood <lockwood@android.com>

media/jni/android_media_MtpDatabase.cpp

diff --git a/media/jni/android_media_MtpDatabase.cpp b/media/jni/android_media_MtpDatabase.cpp
index 227ee92..b5f4856 100644
--- a/media/jni/android_media_MtpDatabase.cpp
+++ b/media/jni/android_media_MtpDatabase.cpp
@@ -456,7 +456,6 @@
 
 MtpResponseCode MyMtpDatabase::getDevicePropertyValue(MtpDeviceProperty property,
                                             MtpDataPacket& packet) {
-
     int         type;
 
     if (!getDevicePropertyInfo(property, type))
@@ -782,10 +781,25 @@
     switch (property) {
         case MTP_DEVICE_PROPERTY_SYNCHRONIZATION_PARTNER:
         case MTP_DEVICE_PROPERTY_DEVICE_FRIENDLY_NAME:
+        {
             // writeable string properties
             result = new MtpProperty(property, MTP_TYPE_STR, true);
-            // FIXME - set current value here!
+
+            // set current value
+            JNIEnv* env = AndroidRuntime::getJNIEnv();
+            jint ret = env->CallIntMethod(mDatabase, method_getDeviceProperty,
+                        (jint)property, mLongBuffer, mStringBuffer);
+            if (ret == MTP_RESPONSE_OK) {
+                jchar* str = env->GetCharArrayElements(mStringBuffer, 0);
+                result->setCurrentValue(str);
+                env->ReleaseCharArrayElements(mStringBuffer, str, 0);
+            } else {
+                LOGE("unable to read device property, response: %04X", ret);
+            }
+
+            checkAndClearExceptionFromCallback(env, __FUNCTION__);
             break;
+        }
     }
 
     return result;