From d675df4f88e99cffa3671bb8b4ac0ad3078ea05a Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Sun, 6 Feb 2011 10:42:55 -0800
Subject: Fix possible NPE in legacy callback support.

Change-Id: I5faa155393466e1bc4b2fc1e9417cde91a8be456
---
 .../src/com/android/ide/common/rendering/legacy/LegacyCallback.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'ide_common')

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) {
-- 
cgit v1.1