LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 2360 into donut

Browse Source 
* 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
parent 906e6529fc 774ac9a0dc
commit 0db48f76fb
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
View File

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