Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev

am: ba9ab17434 Change-Id: I9d8025f6eec133ba914a43acf0fce7ddcbf6e6af
2017-04-27 15:17:16 +00:00
parent ec3ae259d4 ba9ab17434
commit d043979327
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -788,8 +788,8 @@ public final class AssetManager implements AutoCloseable {
    /**
     * Retrieve the resource identifier for the given resource name.
     */
-    /*package*/ native final int getResourceIdentifier(String type,
-                                                       String name,
+    /*package*/ native final int getResourceIdentifier(String name,
+                                                       String defType,
                                                       String defPackage);

    /*package*/ native final String getResourceName(int resid);