Show Android device name in paired clients list

This replaces the hard-coded "Android" string with a more descriptive
identifier such as "Nexus 7".

BUG=330899

Review URL: https://codereview.chromium.org/177313007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254669 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 3 deletions

diff --git a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
index 33f4136..54ca0f2 100644
--- a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
+++ b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
@@ -11,6 +11,7 @@ import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Point;
+import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -228,7 +229,7 @@ public class JniInterface {
                     public void onClick(DialogInterface dialog, int which) {
                         Log.i("jniiface", "User provided a PIN code");
                         nativeAuthenticationResponse(String.valueOf(pinTextView.getText()),
-                                                     pinCheckBox.isChecked());
+                                pinCheckBox.isChecked(), Build.MODEL);
                     }
                 });
 
@@ -269,8 +270,15 @@ public class JniInterface {
         pinDialog.show();
     }
 
-    /** Performs the native response to the user's PIN. */
-    private static native void nativeAuthenticationResponse(String pin, boolean createPair);
+    /**
+     * Performs the native response to the user's PIN.
+     * @param pin The entered PIN.
+     * @param createPair Whether to create a new pairing for this client.
+     * @param deviceName The device name to appear in the pairing registry. Only used if createPair
+     *                   is true.
+     */
+    private static native void nativeAuthenticationResponse(String pin, boolean createPair,
+                                                            String deviceName);
 
     /** Saves newly-received pairing credentials to permanent storage. Called on the UI thread. */
     @CalledByNative