Merge "Null check signature array before comparison" into tm-dev

2022-03-10 20:11:03 +00:00
parent 1c8eb0109f b22a602359
commit 2174fc2339
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/content/pm/Signature.java
+++ b/core/java/android/content/pm/Signature.java
@@ -312,7 +312,7 @@ public class Signature implements Parcelable {
     * @hide
     */
    public static boolean areExactMatch(Signature[] a, Signature[] b) {
-        return (a.length == b.length) && ArrayUtils.containsAll(a, b)
+        return (ArrayUtils.size(a) == ArrayUtils.size(b)) && ArrayUtils.containsAll(a, b)
                && ArrayUtils.containsAll(b, a);
    }

@@ -387,4 +387,4 @@ public class Signature implements Parcelable {

        return sPrime;
    }
-}
+}