Merge change 2360 into donut

* changes:
  Make 'android update adb' write the USB vendor IDs in hexa.
This commit is contained in:
Android (Google) Code Review
2009-05-22 14:11:30 -07:00

View File

@@ -77,11 +77,11 @@ public final class SdkManager {
private final static String ADB_INI_FILE = "adb_usb.ini";
//0--------90--------90--------90--------90--------90--------90--------90--------9
private final static String ADB_INI_COMMENT1 =
"# ANDROID 3RD PARTY USB VENDOR ID LIST -- DO NOT EDIT\n" +
"# USE 'android update adb' TO GENERATE\n" +
"# FIRST NUMBER IS VENDOR ID COUNT\n";
"# ANDROID 3RD PARTY USB VENDOR ID LIST -- DO NOT EDIT.\n" +
"# USE 'android update adb' TO GENERATE.\n" +
"# FIRST NUMBER IS VENDOR ID COUNT.\n";
private final static String ADB_INI_COMMENT2 =
"# FOLLOWING NUMBERS ARE VENDOR ID IN DECIMAL\n";
"# FOLLOWING NUMBERS ARE VENDOR ID.\n";
/** the location of the SDK */
private final String mSdkLocation;
@@ -180,8 +180,7 @@ public final class SdkManager {
// now write the Id in a text file, one per line.
for (Integer i : set) {
writer.write(i.toString());
writer.write("\n");
writer.write(String.format("0x%04x\n", i));
}
} finally {
writer.close();