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

Commit 1a85630c authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I395e170e72863d7770c6d810f85778fa85c9f080
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56eb9d07 8d289773

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

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

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

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

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

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

    }