Merge change 21772 into donut

* changes:
  Fix Resources#opeRawResource(int, TypedValue) in layoutlib.

1 files changed, 18 insertions, 0 deletions

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java
index 8a040e41d772..2b0100b72418 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeResources.java
@@ -497,6 +497,24 @@ public final class BridgeResources extends Resources {
     }
 
     @Override
+    public InputStream openRawResource(int id, TypedValue value) throws NotFoundException {
+        getValue(id, value, true);
+
+        File f = new File(value.string.toString());
+        if (f.isFile()) {
+            try {
+                return new FileInputStream(f);
+            } catch (FileNotFoundException e) {
+                NotFoundException exception = new NotFoundException();
+                exception.initCause(e);
+                throw exception;
+            }
+        }
+
+        throw new NotFoundException();
+    }
+
+    @Override
     public AssetFileDescriptor openRawResourceFd(int id) throws NotFoundException {
         throw new UnsupportedOperationException();
     }