Merge to trunk cl - fixes/features for mobile support in the editor

dart/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/mobile/AndroidDebugBridge.java

 /*
  * Copyright (c) 2014, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 17 matching lines @@
  * Instance of class {@code AndroidDevBridge} represents the AndroidDevBridge (adb) in the Android
  * SDK
  */
 public class AndroidDebugBridge {
 
   private File adb;
 
   private static String[] INSTALL_CMD = new String[] {"install"};
   private static String[] DEVICES_CMD = new String[] {"devices"};
 
+  private static final String DEVICE_CONNECTED_SUFFIX = "\tdevice";
+  private static final String UNAUTHORIZED_SUFFIX = "\tunauthorized";
+
   private static String[] LAUNCH_URL_IN_CC_CMD = new String[] {
       "shell", "am", "start", "-n", "org.chromium.content_shell_apk/.ContentShellActivity", "-d"};
 
   private static String[] LAUNCH_URL_IN_BROWSER_CMD = new String[] {
       "shell", "am", "start", "-n", "com.android.chrome/com.google.android.apps.chrome.Main", "-d"};
 
   private static String[] STOP_APP_CMD = new String[] {
       "shell", "am", "force-stop", "org.chromium.content_shell_apk"};
 
   private static final String CONTENT_SHELL_DEBUG_PORT = "localabstract:content_shell_devtools_remote";
@@ skipping 20 matching lines @@
     return androidDebugBridge;
   }
 
   AndroidDebugBridge(File adbExecutable) {
     this.adb = adbExecutable;
   }
 
   /**
    * Gets the first device connected and detected by adb
    * 
-   * @return the device id or {@code null} if no device detected
+   * @return the device or {@code null} if no device detected
    */
-  public String getConnectedDevice() {
+  public AndroidDevice getConnectedDevice() {
     List<String> args = buildAdbCommand(DEVICES_CMD);
     if (runAdb(args)) {
       //List of devices attached 
       //04f5385f95d80610  device
+      //T062873654  unauthorized
+      String unauthorized = null;
       LineNumberReader reader = new LineNumberReader(new StringReader(runner.getStdOut()));
       try {
         while (true) {
           String line = reader.readLine();
           if (line == null) {
             break;
           }
           line = line.trim();
-          if (line.endsWith("\tdevice")) {
-            return line.substring(0, line.length() - 7).trim();
+          if (line.endsWith(DEVICE_CONNECTED_SUFFIX)) {
+            String id = line.substring(0, line.length() - DEVICE_CONNECTED_SUFFIX.length()).trim();
+            return new AndroidDevice(id, true);
+          }
+          if (line.endsWith(UNAUTHORIZED_SUFFIX)) {
+            unauthorized = line.substring(0, line.length() - UNAUTHORIZED_SUFFIX.length()).trim();
           }
         }
       } catch (IOException e) {
         //$FALL-THROUGH$
       }
+      if (unauthorized != null) {
+        return new AndroidDevice(unauthorized, false);
+      }
     }
     return null;
   }
 
   /**
    * Install the apk for the content shell onto the connected phone
    * <p>
    * adb install path/to/apk
    * </p>
    * 
@@ skipping 18 matching lines @@
         // TODO(keertip): check version and reinstall
         // DartCore.getConsole().println(message);
       }
       contentShellInstallSet.add(deviceId);
       return true;
     }
     return false;
   }
 
   /**
+   * Determine if a mobile device is connected and authorized.
+   */
+  public boolean isDeviceConnectedAndAuthorized() {
+    AndroidDevice device = getConnectedDevice();
+    return device != null && device.isAuthorized();
+  }
+
+  /**
    * Open the url in the chrome browser on the device
    * <p>
    * adb shell am start com.android.chrome/com.google.android.apps.chrome.Main -d url
    * </p>
    */
   public boolean launchChromeBrowser(String url) {
     List<String> args = buildAdbCommand(LAUNCH_URL_IN_BROWSER_CMD);
     args.add(url);
     return runAdb(args, "ADB: launch browser");
   }
@@ skipping 91 matching lines @@
       exitCode = runner.runSync(null);
       if (exitCode != 0) {
         DartCore.getConsole().println(runner.getStdErr());
       }
 
     } catch (IOException e) {
       DartCore.logError(e);
     }
     return exitCode == 0 ? true : false;
   }
-
 }