Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e8a319 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Removed AssetManager#dumpResources. 

This method was used only for debugging and has not been useful for
quite a long time.

Change-Id: I38f3c60bb6a7400758623ac80faf2350e387d51e
parent 34c6cdab

core/java/android/content/res/AssetManager.java

+0 −6
Original line number Diff line number Diff line
@@ -673,12 +673,6 @@ public final class AssetManager { 
     */

    public native final int updateResourcesWithAssetPath(String path);



    /**

     * Debug method to dump resource information.

     * {@hide}

     */

    public native final void dumpResources();



    /**

     * Sets a flag indicating that this AssetManager should have themes

     * attached, according to the initial request to create it by the

core/jni/android_util_AssetManager.cpp

+0 −11
Original line number Diff line number Diff line
@@ -1970,15 +1970,6 @@ static jint android_content_AssetManager_updateResourcesWithAssetPath( 
    return (res) ? (jint)cookie : 0;

}



static void android_content_AssetManager_dumpRes(JNIEnv* env, jobject clazz)

{

    AssetManager* am = assetManagerForJavaObject(env, clazz);

    if (am == NULL) {

        return;

    }

    am->dumpRes();

}



// ----------------------------------------------------------------------------



/*
@@ -2098,8 +2089,6 @@ static JNINativeMethod gAssetManagerMethods[] = { 
        (void*) android_content_AssetManager_removeAssetPath },

    { "updateResourcesWithAssetPath",   "(Ljava/lang/String;)I",

        (void*) android_content_AssetManager_updateResourcesWithAssetPath },

    { "dumpResources", "()V",

        (void*) android_content_AssetManager_dumpRes },

    { "getBasePackageCount", "()I",

        (void*) android_content_AssetManager_getBasePackageCount },

    { "getBasePackageName", "(I)Ljava/lang/String;",

include/utils/AssetManager.h

+0 −1
Original line number Diff line number Diff line
@@ -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();

include/utils/ResourceTypes.h

+0 −1
Original line number Diff line number Diff line
@@ -1993,7 +1993,6 @@ public: 
#ifndef HAVE_ANDROID_OS

    void print(bool inclValues) const;

#endif

    void dump() const;



private:

    struct Header;

libs/utils/AssetManager.cpp

+0 −10
Original line number Diff line number Diff line
@@ -1808,16 +1808,6 @@ bool AssetManager::removeAssetPath(const String8 &packageName, void* cookie) 
    return true;

}



void AssetManager::dumpRes()

{

    ResTable* rt = mResources;

    if (rt == NULL) {

        fprintf(stderr, "ResTable must not be NULL");

        return;

    }

    rt->dump();

}



void AssetManager::addRedirections(PackageRedirectionMap* resMap)

{

    getResources();