New policy for internal and wired device names.
For internal and unknowable wired devices, return the product name (i.e. "Nexus 7").
For connected devices with manufacturer-supplied product names, return those.
Change getName() to getProductName().
Bug: 20880296
Change-Id: I67ef3d4c73b3acab368b0879faa26fa9127c21bb
diff --git a/services/core/java/com/android/server/WiredAccessoryManager.java b/services/core/java/com/android/server/WiredAccessoryManager.java
index 0de8c8d..e0e6070 100644
--- a/services/core/java/com/android/server/WiredAccessoryManager.java
+++ b/services/core/java/com/android/server/WiredAccessoryManager.java
@@ -216,9 +216,9 @@
mWakeLock.acquire();
- Log.i(TAG, "MSG_NEW_DEVICE_STATE ");
+ Log.i(TAG, "MSG_NEW_DEVICE_STATE");
Message msg = mHandler.obtainMessage(MSG_NEW_DEVICE_STATE, headsetState,
- mHeadsetState, newName);
+ mHeadsetState, "");
mHandler.sendMessage(msg);
mHeadsetState = headsetState;