diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-06 11:29:14 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-02-06 11:29:14 -0800 |
| commit | 94de9c1b90e89d1c7ab35eebf6fa77e4540de8d4 (patch) | |
| tree | 376b4b32fa3d9e42a466a9703601fe2a1a7f3115 | |
| parent | bd321b2fe454a600bcd6a162399086504e590a22 (diff) | |
| parent | d675df4f88e99cffa3671bb8b4ac0ad3078ea05a (diff) | |
| download | sdk-94de9c1b90e89d1c7ab35eebf6fa77e4540de8d4.zip sdk-94de9c1b90e89d1c7ab35eebf6fa77e4540de8d4.tar.gz sdk-94de9c1b90e89d1c7ab35eebf6fa77e4540de8d4.tar.bz2 | |
Merge "Fix possible NPE in legacy callback support."
| -rw-r--r-- | ide_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ide_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java b/ide_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java index f4bc15a..144a196 100644 --- a/ide_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java +++ b/ide_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java @@ -41,7 +41,11 @@ public abstract class LegacyCallback implements public final String[] resolveResourceValue(int id) { Pair<ResourceType, String> info = resolveResourceId(id); - return new String[] { info.getSecond(), info.getFirst().getName() }; + if (info != null) { + return new String[] { info.getSecond(), info.getFirst().getName() }; + } + + return null; } public final String resolveResourceValue(int[] id) { |