Snap for 8426163 from 49a88f9bba34225f3bd7532a79dc5ae89b726a1d to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I3c1b823abbe933099659472ffb18c7128d00e6f1

1 files changed, 28 insertions, 0 deletions

diff --git a/src/com/android/providers/contacts/TransactionContext.java b/src/com/android/providers/contacts/TransactionContext.java
index 86dae01b..dfb6d696 100644
--- a/src/com/android/providers/contacts/TransactionContext.java
+++ b/src/com/android/providers/contacts/TransactionContext.java
@@ -35,6 +35,7 @@ public class TransactionContext  {
     /** Map from raw contact id to account Id */
     private ArrayMap<Long, Long> mInsertedRawContactsAccounts;
     private ArraySet<Long> mUpdatedRawContacts;
+    private ArraySet<Long> mMetadataDirtyRawContacts;
     private ArraySet<Long> mBackupIdChangedRawContacts;
     private ArraySet<Long> mDirtyRawContacts;
     // Set used to track what has been changed and deleted. This is needed so we can update the
@@ -77,6 +78,22 @@ public class TransactionContext  {
         markRawContactChangedOrDeletedOrInserted(rawContactId);
     }
 
+    public void markRawContactMetadataDirty(long rawContactId, boolean isMetadataSyncAdapter) {
+        if (!isMetadataSyncAdapter) {
+            if (mMetadataDirtyRawContacts == null) {
+                mMetadataDirtyRawContacts = new ArraySet<>();
+            }
+            mMetadataDirtyRawContacts.add(rawContactId);
+        }
+    }
+
+    public void markBackupIdChangedRawContact(long rawContactId) {
+        if (mBackupIdChangedRawContacts == null) {
+            mBackupIdChangedRawContacts = new ArraySet<>();
+        }
+        mBackupIdChangedRawContacts.add(rawContactId);
+    }
+
     public void markRawContactChangedOrDeletedOrInserted(long rawContactId) {
         if (mChangedRawContacts == null) {
             mChangedRawContacts = new ArraySet<>();
@@ -114,6 +131,16 @@ public class TransactionContext  {
         return mDirtyRawContacts;
     }
 
+    public Set<Long> getMetadataDirtyRawContactIds() {
+        if (mMetadataDirtyRawContacts == null) mMetadataDirtyRawContacts = new ArraySet<>();
+        return mMetadataDirtyRawContacts;
+    }
+
+    public Set<Long> getBackupIdChangedRawContacts() {
+        if (mBackupIdChangedRawContacts == null) mBackupIdChangedRawContacts = new ArraySet<>();
+        return mBackupIdChangedRawContacts;
+    }
+
     public Set<Long> getChangedRawContactIds() {
         if (mChangedRawContacts == null) mChangedRawContacts = new ArraySet<>();
         return mChangedRawContacts;
@@ -149,6 +176,7 @@ public class TransactionContext  {
         mUpdatedRawContacts = null;
         mUpdatedSyncStates = null;
         mDirtyRawContacts = null;
+        mMetadataDirtyRawContacts = null;
         mChangedRawContacts = null;
         mBackupIdChangedRawContacts = null;
     }