am e92b9706: am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single...

[android/aapt.git] / ResourceTable.cpp

diff --git a/ResourceTable.cpp b/ResourceTable.cpp
index 3d7b0889f0e2f75540948a9a22d33408d8144b2e..52ebaf0f7775d3778a583b412e523db16eba612d 100644 (file)
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@ -8,6 +8,7 @@
 
 #include "XMLNode.h"
 #include "ResourceFilter.h"
 
 #include "XMLNode.h"
 #include "ResourceFilter.h"

+#include "ResourceIdCache.h"

 
 #include <androidfw/ResourceTypes.h>
 #include <utils/ByteOrder.h>
 
 #include <androidfw/ResourceTypes.h>
 #include <utils/ByteOrder.h>


@@ -1998,6 +1999,9 @@ uint32_t ResourceTable::getResId(const String16& package,
                                  const String16& name,
                                  bool onlyPublic) const
 {
                                  const String16& name,
                                  bool onlyPublic) const
 {

+    uint32_t id = ResourceIdCache::lookup(package, type, name, onlyPublic);
+    if (id != 0) return id;     // cache hit
+

     sp<Package> p = mPackages.valueFor(package);
     if (p == NULL) return 0;
 
     sp<Package> p = mPackages.valueFor(package);
     if (p == NULL) return 0;
 


@@ -2016,11 +2020,10 @@ uint32_t ResourceTable::getResId(const String16& package,
         }
         
         if (Res_INTERNALID(rid)) {
         }
         
         if (Res_INTERNALID(rid)) {

-            return rid;
+            return ResourceIdCache::store(package, type, name, onlyPublic, rid);

         }
         }

-        return Res_MAKEID(p->getAssignedId()-1,
-                          Res_GETTYPE(rid),
-                          Res_GETENTRY(rid));
+        return ResourceIdCache::store(package, type, name, onlyPublic,
+                Res_MAKEID(p->getAssignedId()-1, Res_GETTYPE(rid), Res_GETENTRY(rid)));

     }
 
     sp<Type> t = p->getTypes().valueFor(type);
     }
 
     sp<Type> t = p->getTypes().valueFor(type);


@@ -2029,7 +2032,9 @@ uint32_t ResourceTable::getResId(const String16& package,
     if (c == NULL) return 0;
     int32_t ei = c->getEntryIndex();
     if (ei < 0) return 0;
     if (c == NULL) return 0;
     int32_t ei = c->getEntryIndex();
     if (ei < 0) return 0;

-    return getResId(p, t, ei);
+
+    return ResourceIdCache::store(package, type, name, onlyPublic,
+            getResId(p, t, ei));

 }
 
 uint32_t ResourceTable::getResId(const String16& ref,
 }
 
 uint32_t ResourceTable::getResId(const String16& ref,