Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(465)

Unified Diff: media/midi/java/src/org/chromium/midi/MidiDeviceAndroid.java

Issue 2425863003: Web MIDI Android: Use PROPERTY_NAME if PROPERTY_PRODUCT is empty (Closed)
Patch Set: add TODO Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/java/src/org/chromium/midi/MidiDeviceAndroid.java
diff --git a/media/midi/java/src/org/chromium/midi/MidiDeviceAndroid.java b/media/midi/java/src/org/chromium/midi/MidiDeviceAndroid.java
index 62601ce07d839d2b21da5041137b893508e3fe57..df9af4f85e2f1cc22f063d3498634cfdd5cfb4eb 100644
--- a/media/midi/java/src/org/chromium/midi/MidiDeviceAndroid.java
+++ b/media/midi/java/src/org/chromium/midi/MidiDeviceAndroid.java
@@ -102,7 +102,16 @@ class MidiDeviceAndroid {
*/
@CalledByNative
String getProduct() {
- return getProperty(MidiDeviceInfo.PROPERTY_PRODUCT);
+ String product = getProperty(MidiDeviceInfo.PROPERTY_PRODUCT);
+ // TODO(crbug.com/636455): Following code to use PROPERTY_NAME is a
+ // workaround for a BLE MIDI device issue that Android does not provide
+ // information for PROPERTY_MANUFACTURER, PROPERTY_PRODUCT, and
+ // PROPERTY_VERSION. Confirmed on Android M and N.
+ // See discussion at http://crbug.com/636455 and http://b/32259464.
+ if (product == null || product.isEmpty()) {
+ return getProperty(MidiDeviceInfo.PROPERTY_NAME);
+ }
+ return product;
}
/**
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698