diff options
| author | Raphael Moll <ralf@android.com> | 2014-04-14 11:32:40 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2014-04-14 11:32:40 -0700 |
| commit | 815f080576d51379a9065aa115776eecf3b1688e (patch) | |
| tree | 80cfaeed1c8e43beaa522f121ea78f4969746dff | |
| parent | c2308ae9a06207c610b0429fbe9897d7c0311598 (diff) | |
| download | platform_tools_swt-815f080576d51379a9065aa115776eecf3b1688e.tar.gz platform_tools_swt-815f080576d51379a9065aa115776eecf3b1688e.tar.bz2 platform_tools_swt-815f080576d51379a9065aa115776eecf3b1688e.zip | |
Fix FindBugs warnings in sdklib. Part 2.
Depends on tools/base change Ifa65d9a2d02a8f29cd955a7173a7378aff080e13
Change-Id: I42d5fb5ada1cc3902100b5221801eef56733dbec
2 files changed, 6 insertions, 3 deletions
diff --git a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java index 50792f1..7731a66 100644 --- a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java +++ b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java @@ -1393,7 +1393,7 @@ public class AvdCreationDialog extends GridDialog { String gpuEmulation = props.get(AvdManager.AVD_INI_GPU_EMULATION); mGpuEmulation.setSelection(gpuEmulation != null && - gpuEmulation.equals(HardwareProperties.BOOLEAN_VALUES[0])); + gpuEmulation.equals(HardwareProperties.BOOLEAN_YES)); String sdcard = props.get(AvdManager.AVD_INI_SDCARD_PATH); if (sdcard != null && sdcard.length() > 0) { diff --git a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/LegacyAvdEditDialog.java b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/LegacyAvdEditDialog.java index e3197bb..c66a1f3 100644 --- a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/LegacyAvdEditDialog.java +++ b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/LegacyAvdEditDialog.java @@ -632,7 +632,7 @@ final class LegacyAvdEditDialog extends GridDialog { break; case BOOLEAN: index = (Integer)value; - mProperties.put((String)element, HardwareProperties.BOOLEAN_VALUES[index]); + mProperties.put((String)element, HardwareProperties.getBooleanValue(index)); break; case STRING_ENUM: case INTEGER_ENUM: @@ -687,7 +687,10 @@ final class LegacyAvdEditDialog extends GridDialog { return new TextCellEditor(hardwareTable); case BOOLEAN: return new ComboBoxCellEditor(hardwareTable, - HardwareProperties.BOOLEAN_VALUES, + new String[] { + HardwareProperties.getBooleanValue(0), + HardwareProperties.getBooleanValue(1), + }, SWT.READ_ONLY | SWT.DROP_DOWN); case STRING_ENUM: case INTEGER_ENUM: |