Merge "Fix LayoutlibTestCallback.getResourceId"

2017-02-16 13:31:32 +00:00
parent 677f0d6c7c 3a73332350
commit 65febdd300
1 changed files with 5 additions and 1 deletions
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
@@ -132,7 +132,11 @@ public class LayoutLibTestCallback extends LayoutlibCallback {

    @Override
    public Integer getResourceId(ResourceType type, String name) {
-        return mResources.get(type).get(name);
+        Map<String, Integer> resName2Id = mResources.get(type);
+        if (resName2Id == null) {
+            return null;
+        }
+        return resName2Id.get(name);
    }

    @Override