Merge "Fix LayoutlibTestCallback.getResourceId" (65febdd3) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -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