Merge branch 'themes-2.3.1_r1' of https://github.com/tmobile/themes-platform-frameworks-base into HEAD

2 files changed, 10 insertions, 12 deletions

diff --git a/include/utils/AssetManager.h b/include/utils/AssetManager.h
index f374cae..e69bc5a 100644
--- a/include/utils/AssetManager.h
+++ b/include/utils/AssetManager.h
@@ -81,8 +81,8 @@ public:
     virtual ~AssetManager(void);
 
     static int32_t getGlobalCount();
-
-    /*
+    
+    /*                                                                       
      * Add a new source for assets.  This can be called multiple times to
      * look in multiple places for assets.  It can be either a directory (for
      * finding assets as raw files on the disk) or a ZIP file.  This newly
@@ -95,13 +95,13 @@ public:
      */
     bool addAssetPath(const String8& path, void** cookie);
 
-    /*
+    /*                                                                       
      * Convenience for adding the standard system assets.  Uses the
      * ANDROID_ROOT environment variable to find them.
      */
     bool addDefaultAssets();
 
-    /*
+    /*                                                                       
      * Iterate over the asset paths in this manager.  (Previously
      * added via addAssetPath() and addDefaultAssets().)  On first call,
      * 'cookie' must be NULL, resulting in the first cookie being returned.
@@ -110,7 +110,7 @@ public:
      */
     void* nextAssetPath(void* cookie) const;
 
-    /*
+    /*                                                                       
      * Return an asset path in the manager.  'which' must be between 0 and
      * countAssetPaths().
      */
@@ -194,7 +194,7 @@ public:
      */
     FileType getFileType(const char* fileName);
 
-    /*
+    /*                                                                       
      * Return the complete resource table to find things in the package.
      */
     const ResTable& getResources(bool required = true) const;
@@ -213,7 +213,7 @@ public:
      * the current data.
      */
     bool isUpToDate();
-
+    
     /**
      * Get the known locales for this asset manager object.
      */
@@ -228,7 +228,6 @@ public:
      */
     bool removeAssetPath(const String8 &packageName, void *cookie);
     bool updateWithAssetPath(const String8& path, void** cookie);
-    void dumpRes();
     void addRedirections(PackageRedirectionMap* resMap);
     void clearRedirections();
 
@@ -291,7 +290,7 @@ private:
         ResTable* setResourceTable(ResTable* res);
         
         bool isUpToDate();
-
+        
     protected:
         ~SharedZip();
 
@@ -338,7 +337,7 @@ private:
         static String8 getPathName(const char* path);
 
         bool isUpToDate();
-
+        
     private:
         void closeZip(int idx);
 
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h
index bae6b92..f7a61d7 100644
--- a/include/utils/ResourceTypes.h
+++ b/include/utils/ResourceTypes.h
@@ -1993,7 +1993,6 @@ public:
 #ifndef HAVE_ANDROID_OS
     void print(bool inclValues) const;
 #endif
-    void dump() const;
 
 private:
     struct Header;
@@ -2015,7 +2014,7 @@ private:
         const ResTable_package* const pkg, const Header* const header);
 
     void print_value(const Package* pkg, const Res_value& value) const;
-
+    
     mutable Mutex               mLock;
 
     status_t                    mError;