Merge "New policy for internal and wired device names." into mnc-dev

api/current.txt

@@ -14704,7 +14704,7 @@ package android.media {
     method public int[] getChannelMasks();
     method public int[] getFormats();
     method public int getId();
-    method public java.lang.CharSequence getName();
+    method public java.lang.CharSequence getProductName();
     method public int[] getSampleRates();
     method public int getType();
     method public boolean isSink();

api/system-current.txt

@@ -15917,7 +15917,7 @@ package android.media {
     method public int[] getChannelMasks();
     method public int[] getFormats();
     method public int getId();
-    method public java.lang.CharSequence getName();
+    method public java.lang.CharSequence getProductName();
     method public int[] getSampleRates();
     method public int getType();
     method public boolean isSink();

media/java/android/media/AudioDeviceInfo.java

@@ -122,8 +122,9 @@ public final class AudioDeviceInfo {
     /**
      * @return The human-readable name of the audio device.
      */
-    public CharSequence getName() {
-        return mPort.name();
+    public CharSequence getProductName() {
+        String portName = mPort.name();
+        return portName.length() != 0 ? portName : android.os.Build.MODEL;
     }
 
     /**

services/core/java/com/android/server/WiredAccessoryManager.java

@@ -216,9 +216,9 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks {
 
         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;