Merge "Make isAppBad() lock-free" into rvc-qpr-dev am: 460929b61e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13666974

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I908d468bcde96d5290fc73ca89db485402292a6b

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/com/android/internal/app/ProcessMap.java b/core/java/com/android/internal/app/ProcessMap.java
index 81036f7ecba8..4917a47eb000 100644
--- a/core/java/com/android/internal/app/ProcessMap.java
+++ b/core/java/com/android/internal/app/ProcessMap.java
@@ -22,7 +22,7 @@ import android.util.SparseArray;
 public class ProcessMap<E> {
     final ArrayMap<String, SparseArray<E>> mMap
             = new ArrayMap<String, SparseArray<E>>();
-    
+
     public E get(String name, int uid) {
         SparseArray<E> uids = mMap.get(name);
         if (uids == null) return null;
@@ -58,4 +58,6 @@ public class ProcessMap<E> {
     public int size() {
         return mMap.size();
     }
+
+    public void putAll(ProcessMap<E> other) { mMap.putAll(other.mMap); }
 }