Merge "[snapshot] skip onChanged() in Watched* snapshot()" into tm-dev am: cd58d78988

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

Change-Id: I52d9f63eb2a924b289005a41dee270d68f4a1dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/utils/WatchedArrayList.java

@@ -416,7 +416,7 @@ public class WatchedArrayList<E> extends WatchableImpl
         dst.mStorage.ensureCapacity(end);
         for (int i = 0; i < end; i++) {
             final E val = Snapshots.maybeSnapshot(src.get(i));
-            dst.add(val);
+            dst.mStorage.add(val);
         }
         dst.seal();
     }

services/core/java/com/android/server/utils/WatchedArrayMap.java

@@ -465,7 +465,7 @@ public class WatchedArrayMap<K, V> extends WatchableImpl
         for (int i = 0; i < end; i++) {
             final V val = Snapshots.maybeSnapshot(src.valueAt(i));
             final K key = src.keyAt(i);
-            dst.put(key, val);
+            dst.mStorage.put(key, val);
         }
         dst.seal();
     }

services/core/java/com/android/server/utils/WatchedArraySet.java

@@ -427,7 +427,7 @@ public class WatchedArraySet<E> extends WatchableImpl
         dst.mStorage.ensureCapacity(end);
         for (int i = 0; i < end; i++) {
             final E val = Snapshots.maybeSnapshot(src.valueAt(i));
-            dst.append(val);
+            dst.mStorage.append(val);
         }
         dst.seal();
     }

services/core/java/com/android/server/utils/WatchedLongSparseArray.java

@@ -410,7 +410,7 @@ public class WatchedLongSparseArray<E> extends WatchableImpl
         for (int i = 0; i < end; i++) {
             final E val = Snapshots.maybeSnapshot(src.valueAt(i));
             final long key = src.keyAt(i);
-            dst.put(key, val);
+            dst.mStorage.put(key, val);
         }
         dst.seal();
     }

services/core/java/com/android/server/utils/WatchedSparseArray.java

@@ -490,7 +490,7 @@ public class WatchedSparseArray<E> extends WatchableImpl
         for (int i = 0; i < end; i++) {
             final E val = Snapshots.maybeSnapshot(src.valueAt(i));
             final int key = src.keyAt(i);
-            dst.put(key, val);
+            dst.mStorage.put(key, val);
         }
         dst.seal();
     }

services/core/java/com/android/server/utils/WatchedSparseBooleanArray.java

@@ -310,7 +310,7 @@ public class WatchedSparseBooleanArray extends WatchableImpl
         }
         final int end = src.size();
         for (int i = 0; i < end; i++) {
-            dst.put(src.keyAt(i), src.valueAt(i));
+            dst.mStorage.put(src.keyAt(i), src.valueAt(i));
         }
         dst.seal();
     }

services/core/java/com/android/server/utils/WatchedSparseIntArray.java

@@ -315,7 +315,7 @@ public class WatchedSparseIntArray extends WatchableImpl
         }
         final int end = src.size();
         for (int i = 0; i < end; i++) {
-            dst.put(src.keyAt(i), src.valueAt(i));
+            dst.mStorage.put(src.keyAt(i), src.valueAt(i));
         }
         dst.seal();
     }

services/core/java/com/android/server/utils/WatchedSparseSetArray.java

@@ -169,7 +169,7 @@ public class WatchedSparseSetArray<T> extends WatchableImpl implements Snappable
             final ArraySet set = src.get(i);
             final int setSize = set.size();
             for (int j = 0; j < setSize; j++) {
-                dst.add(src.keyAt(i), set.valueAt(j));
+                dst.mStorage.add(src.keyAt(i), set.valueAt(j));
             }
         }
         dst.seal();