Initialize mJunkPath to false

[android/aapt.git] / ResourceTable.h

diff --git a/ResourceTable.h b/ResourceTable.h
index cc2a42924a8de738e8f2b78bcedad6bbdf96a132..8123bb3d4226cc0c85f7417381ba51e69ef9508c 100644 (file)
--- a/ResourceTable.h
+++ b/ResourceTable.h
@@ -124,6 +124,11 @@ public:
                        const String16& type,
                        const String16& name) const;
 
+    bool hasBagOrEntry(const String16& package,
+                       const String16& type,
+                       const String16& name,
+                       const ResTable_config& config) const;
+
     bool hasBagOrEntry(const String16& ref,
                        const String16* defType = NULL,
                        const String16* defPackage = NULL);
@@ -162,13 +167,13 @@ public:
     uint32_t getResId(const String16& package,
                       const String16& type,
                       const String16& name,
-                      bool onlyPublic = false) const;
+                      bool onlyPublic = true) const;
 
     uint32_t getResId(const String16& ref,
                       const String16* defType = NULL,
                       const String16* defPackage = NULL,
                       const char** outErrorMsg = NULL,
-                      bool onlyPublic = false) const;
+                      bool onlyPublic = true) const;
 
     static bool isValidResourceName(const String16& s);
     
@@ -376,10 +381,6 @@ public:
         void addEntry(const ResTable_config& config, const sp<Entry>& entry) {
             mEntries.add(config, entry);
         }
-
-        void removeEntryAt(int32_t index) {
-            mEntries.removeItemsAt(index);
-        }
         
         const DefaultKeyedVector<ConfigDescription, sp<Entry> >& getEntries() const { return mEntries; }
     private:
@@ -452,9 +453,6 @@ public:
         const DefaultKeyedVector<String16, sp<ConfigList> >& getConfigs() const { return mConfigs; }
         const Vector<sp<ConfigList> >& getOrderedConfigs() const { return mOrderedConfigs; }
 
-        void removeUniqueConfig(ConfigDescription& config) { mUniqueConfigs.remove(config); }
-        void removeOrderedConfigAt(uint32_t index) { mOrderedConfigs.removeItemsAt(index); }
-
         const SortedVector<String16>& getCanAddEntries() const { return mCanAddEntries; }
         
         const SourcePos& getPos() const { return mPos; }
@@ -551,31 +549,4 @@ private:
     map<String16, set<String8> > mLocalizations;
 };
 
-class ResourceFilter
-{
-public:
-    ResourceFilter() : mData(), mContainsPseudo(false) {}
-    status_t parse(const char* arg);
-    bool match(int axis, uint32_t value);
-    bool match(const ResTable_config& config);
-    inline bool containsPseudo() { return mContainsPseudo; }
-
-private:
-    KeyedVector<int,SortedVector<uint32_t> > mData;
-    bool mContainsPseudo;
-};
-
-class ResourceConfigReferences
-{
-public:
-    ResourceConfigReferences() : mRoots() {}
-    ~ResourceConfigReferences();
-    status_t add(uint32_t id, const ResTable_config& config);
-    bool isRoot(uint32_t id, const ResTable_config& config);
-    void dump();
-
-private:
-    KeyedVector<uint32_t, Vector<const ResTable_config*> > mRoots;
-};
-
 #endif