)]}' { "log": [ { "commit": "cf86ae5bbdb8082ce1f13e8134702046ae2ab4ff", "tree": "571726fd5424e92926efc9b15db2316bc4573cbb", "parents": [ "9c99fd37dea61db7ba5d109b98c462ff4eff363f", "da2e816143849a27045b952a035be35edcc76e32" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Mar 10 09:51:40 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 10 09:51:40 2025 -0700" }, "message": "Merge \"Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\" into main" }, { "commit": "da2e816143849a27045b952a035be35edcc76e32", "tree": "571726fd5424e92926efc9b15db2316bc4573cbb", "parents": [ "9c99fd37dea61db7ba5d109b98c462ff4eff363f", "02b04dce158abf245e78b784b4964e1d9206d0b1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:01 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:01 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: I1aebe161f1f563007c4f3006a243e7f03bbf9d23\nChange-Id: I3e8e70fe89e175fdfa725b1c35f9f65167edd58e\n" }, { "commit": "02b04dce158abf245e78b784b4964e1d9206d0b1", "tree": "571726fd5424e92926efc9b15db2316bc4573cbb", "parents": [ "6fafe4b2f2522a6a388effee61c3beb6aa25ca0e", "45d89808e9aa1624c638ed401dffefd63a3e9bf2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 27 15:16:01 2025 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 27 15:16:01 2025 -0800" }, "message": "Merge \"Merge 25Q1 (ab/12770256) to aosp-main-future\" into aosp-main-future" }, { "commit": "6fafe4b2f2522a6a388effee61c3beb6aa25ca0e", "tree": "21cb0cd7117e089a2bd99a3295ed0f8d941c855d", "parents": [ "657fd913e4fd2d6e6b071e4cbc5c544761280e05", "9c99fd37dea61db7ba5d109b98c462ff4eff363f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Feb 26 16:25:06 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 26 16:25:06 2025 -0800" }, "message": "Merge \"packages/providers/ContactsProvider: remove deprecated Mockito usages\" into main am: 9c99fd37de\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3506356\n\nChange-Id: I102d5d6dc94e154de985013cf2bfa4417f4bbfe0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9c99fd37dea61db7ba5d109b98c462ff4eff363f", "tree": "21cb0cd7117e089a2bd99a3295ed0f8d941c855d", "parents": [ "02f030b87e5a277ef65f53c3fc143b53f70c3233", "5a26fd51d9952a8866d735eb067838b387421ded" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Feb 26 15:52:10 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 26 15:52:10 2025 -0800" }, "message": "Merge \"packages/providers/ContactsProvider: remove deprecated Mockito usages\" into main" }, { "commit": "5a26fd51d9952a8866d735eb067838b387421ded", "tree": "21cb0cd7117e089a2bd99a3295ed0f8d941c855d", "parents": [ "02f030b87e5a277ef65f53c3fc143b53f70c3233" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Feb 25 15:39:37 2025 +0100" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Feb 25 16:54:01 2025 +0100" }, "message": "packages/providers/ContactsProvider: remove deprecated Mockito usages\n\nTest: m checkbuild\nFlag: TEST_ONLY\nChange-Id: Ieade73288fdfd8817f0fdd1badff5ad7023e27fd\n" }, { "commit": "45d89808e9aa1624c638ed401dffefd63a3e9bf2", "tree": "7197e44f882e2b79e2fba65f99b4764ee36c4891", "parents": [ "657fd913e4fd2d6e6b071e4cbc5c544761280e05", "2483792d1d9c38b0f95073c20558cf79b06c71bb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:21 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:21 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I75d9da01c27042225489ed4659fabe8f976793c8\nChange-Id: I89890f4ebb7df22fb2680f0cdfefef16bb4bd9fd\n" }, { "commit": "657fd913e4fd2d6e6b071e4cbc5c544761280e05", "tree": "e4cd6e391797775bfbd72222dc79e7c25f456569", "parents": [ "0cb1cea2d579903cc154451dcfc19d190936e721", "02f030b87e5a277ef65f53c3fc143b53f70c3233" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Wed Jan 15 22:05:54 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 15 22:05:54 2025 -0800" }, "message": "Merge \"Explicitly keep default constructor in rules without members\" into main am: 02f030b87e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3438541\n\nChange-Id: I6fb07aa9e4638518c0a64dc5e64d218685388f07\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "02f030b87e5a277ef65f53c3fc143b53f70c3233", "tree": "e4cd6e391797775bfbd72222dc79e7c25f456569", "parents": [ "870559c0fb6394d3fb10bce16b2db96a6b3bb8b1", "084350833ee35453ad8f8c38b2df8183f9d16d6c" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Wed Jan 15 21:36:18 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 15 21:36:18 2025 -0800" }, "message": "Merge \"Explicitly keep default constructor in rules without members\" into main" }, { "commit": "084350833ee35453ad8f8c38b2df8183f9d16d6c", "tree": "e4cd6e391797775bfbd72222dc79e7c25f456569", "parents": [ "870559c0fb6394d3fb10bce16b2db96a6b3bb8b1" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Mon Jan 06 13:01:27 2025 +0100" }, "committer": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Tue Jan 07 23:54:07 2025 -0800" }, "message": "Explicitly keep default constructor in rules without members\n\nR8 implicitly keeps the default constructor when no member rules are specified. Future versions of R8 will require apps to explicitly keep the default constructors that are required for the build to work.\n\nThis conservatively changes all keep rules that currently keep the default constructor to explicitly keep the default constructor.\n\nFuture work will attempt to tighten up the rules that do not require the default constructor to be kept.\n\nBug: 373579455\nBug: 387953561\nTest: existing\nChange-Id: Ibfb967417af6914cdf04a7f242fd6773d7dd8b7a\n" }, { "commit": "0cb1cea2d579903cc154451dcfc19d190936e721", "tree": "eb99997b7c7f48a89fe4463d115952a116e750bb", "parents": [ "d9cf4075ac250b29198dce1474e2108b7fa0ec11", "870559c0fb6394d3fb10bce16b2db96a6b3bb8b1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 18:18:21 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 18:18:21 2024 -0800" }, "message": "[automerger skipped] Merge \"Merge 24Q4 into AOSP main\" into main am: 870559c0fb -s ours\n\nam skip reason: Merged-In I0d93d5dca2b2c3102feaa72b49bb9e879bd47711 with SHA-1 48f5401c4d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3414117\n\nChange-Id: Ibdad2e93eeefdaf3ef089052b1d1bbfcaaadb05f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d9cf4075ac250b29198dce1474e2108b7fa0ec11", "tree": "eb99997b7c7f48a89fe4463d115952a116e750bb", "parents": [ "6ba2fe84bd7d7d9a4c59872e96777c3b8a35c0b3", "bab41bc9ba3e0aa67644eda0f972fdcb17851f53" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 18:18:18 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 18:18:18 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: bab41bc9ba -s ours\n\nam skip reason: Merged-In I0d93d5dca2b2c3102feaa72b49bb9e879bd47711 with SHA-1 48f5401c4d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3414117\n\nChange-Id: I7d611db22ea9da1b57c23abc2c9d5790750a79d6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "870559c0fb6394d3fb10bce16b2db96a6b3bb8b1", "tree": "eb99997b7c7f48a89fe4463d115952a116e750bb", "parents": [ "0adfb4ad55fa93d06a02fb4818dc606e826775a1", "bab41bc9ba3e0aa67644eda0f972fdcb17851f53" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 16:59:25 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 13 16:59:25 2024 -0800" }, "message": "Merge \"Merge 24Q4 into AOSP main\" into main" }, { "commit": "bab41bc9ba3e0aa67644eda0f972fdcb17851f53", "tree": "eb99997b7c7f48a89fe4463d115952a116e750bb", "parents": [ "0adfb4ad55fa93d06a02fb4818dc606e826775a1", "6ba2fe84bd7d7d9a4c59872e96777c3b8a35c0b3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:24 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:24 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: I0d93d5dca2b2c3102feaa72b49bb9e879bd47711\nChange-Id: I5677365a0bb75be0bc5491ec33977a157ce7de8b\n" }, { "commit": "2483792d1d9c38b0f95073c20558cf79b06c71bb", "tree": "af576ba72daa3b4411d16d66392b6ea7fea3ef44", "parents": [ "681c3a20084753f40828982ee70bff96cf2a46a4", "233e9af67228c7f50c2a02f8b64eca83e474e988" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Wed Dec 04 21:03:00 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 04 21:03:00 2024 +0000" }, "message": "Merge \"Define AppCompat Change ID in a standalone java class and make it in a standlone java-library, so that the it could be recognized by AppCompat Framework\" into main" }, { "commit": "681c3a20084753f40828982ee70bff96cf2a46a4", "tree": "7c12e453fea238745fcfe1cd61e08cf765b0a678", "parents": [ "1dc107ec8d4c5cb0bab085e6861fa376c1d91f36", "2ebc369e8c19235e6fccbf9c24edf9ea871e8b0e" ], "author": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Wed Dec 04 17:03:33 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 04 17:03:33 2024 +0000" }, "message": "Merge \"Use SQLite pre-compiled statement to create stale search index table\" into main" }, { "commit": "1dc107ec8d4c5cb0bab085e6861fa376c1d91f36", "tree": "442450715d8750892c0b9ce3188f091454273920", "parents": [ "b5782f41613b048f103dbd7ce9430d9ddbf22a5f", "6ba2fe84bd7d7d9a4c59872e96777c3b8a35c0b3" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Dec 04 10:21:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 04 10:21:53 2024 +0000" }, "message": "Merge \"Update comments to point to the new location of event.logtags.\" into main am: 0adfb4ad55 am: 6ba2fe84bd\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3377712\n\nChange-Id: I42352fda3e2d5807f49d70cee11f4856f333c44c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6ba2fe84bd7d7d9a4c59872e96777c3b8a35c0b3", "tree": "eb99997b7c7f48a89fe4463d115952a116e750bb", "parents": [ "27b7c4c98427721baf53c034a5839f7f8e0b6e79", "0adfb4ad55fa93d06a02fb4818dc606e826775a1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Dec 04 09:57:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 04 09:57:04 2024 +0000" }, "message": "Merge \"Update comments to point to the new location of event.logtags.\" into main am: 0adfb4ad55\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3377712\n\nChange-Id: I9184a7e4559c77c2adb64753d70ebd378f0c63ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0adfb4ad55fa93d06a02fb4818dc606e826775a1", "tree": "b6b1a067ff007bd7655600c6e5db98bc41e01025", "parents": [ "0fcf507be154b1e8889c80c36a7ad60b26d7a411", "deb528ca1720407ec00d1357fe989a4cbdb69b7a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Dec 04 09:27:27 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 04 09:27:27 2024 +0000" }, "message": "Merge \"Update comments to point to the new location of event.logtags.\" into main" }, { "commit": "2ebc369e8c19235e6fccbf9c24edf9ea871e8b0e", "tree": "a45ebd7803af9abc44fb9b08757f55e79248be55", "parents": [ "b5782f41613b048f103dbd7ce9430d9ddbf22a5f" ], "author": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Mon Dec 02 14:51:19 2024 -0800" }, "committer": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Mon Dec 02 15:08:18 2024 -0800" }, "message": "Use SQLite pre-compiled statement to create stale search index table\n\nGiven the CREATE TEMP TABLE statement is a DDL statement, it will cause\nSQLiteDatabase#execSQL to clear the prepared statement cache because DDL\nstatements result in schema changes. In this case the\ncreateStaleSeachIndexTableIfNotExists could be called multiple times\nduring a single transaction and clearing the cache each time would\nresult in much worse latencies when executing SQL queries.\n\nInstead, using SQLiteDatabase#compileStatement pre-compiles the SQL\nstatement and when directly executing it avoids the clearing of the\nprepared statement cache. This means that even the CREATE TEMP TABLE\nquery itself will take advantage of the cache.\n\nTest: atest CallLogPullRequestTest#updateTimesContacted_cursorIsClosed\nTest: atest ContactsProviderTests\nBug: 363260703\nBug: 367828825\nFlag: com.android.providers.contacts.flags.cp2_sync_search_index_flag\nChange-Id: I75d9da01c27042225489ed4659fabe8f976793c8\n" }, { "commit": "b5782f41613b048f103dbd7ce9430d9ddbf22a5f", "tree": "41f7c1b15fd5d5efdf1cf6d5be6d597638b1f1e6", "parents": [ "f7eaae7b6ef1be60210a2b3b7acf87ab8937bd7b", "319beef124911887fc92d5330ab07c8368475025" ], "author": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Mon Dec 02 17:15:33 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 02 17:15:33 2024 +0000" }, "message": "Merge \"Remove table creation guard for stale search contacts temp table\" into main" }, { "commit": "233e9af67228c7f50c2a02f8b64eca83e474e988", "tree": "5e1bb4e522a583543df73a65b64c6c226c1e1e3f", "parents": [ "62764751c020067ccd1790d69387a1c4df3dbea7" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Sun Dec 01 19:37:28 2024 -0800" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Sun Dec 01 20:35:34 2024 -0800" }, "message": "Define AppCompat Change ID in a standalone java class and make it in a\nstandlone java-library, so that the it could be recognized by AppCompat\nFramework\n\nBug: 361580180\nTest: test on the device after `mp droid`\nFlag: android.provider.new_default_account_api_enabled\n\n\tmodified: Android.bp\n\tnew file: src/com/android/providers/contacts/ChangeIds.java\n\tmodified: src/com/android/providers/contacts/ContactsProvider2.java\n\tmodified: tests/src/com/android/providers/contacts/ContactsProvider2DefaultAccountTest.java\n\nChange-Id: Idb4e734d47a1f7d1a686970f9374c63c27bd5afc\n" }, { "commit": "f7eaae7b6ef1be60210a2b3b7acf87ab8937bd7b", "tree": "b44cfd0221871551fe14dc54c792ca6e6e13e57b", "parents": [ "62764751c020067ccd1790d69387a1c4df3dbea7" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Wed Nov 27 19:00:17 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 27 19:00:28 2024 +0000" }, "message": "Revert \"Migrated to the LocalSimContactsWriteException\"\n\nRevert submission 30533261-LocalSimContactsWriteException\n\nReason for revert: CTS test failed. In addition, the root cause of CTS test failure is that specific exception type thrown in ContentProvider.insert() or .update() cannot be parceled to ContentResolver.insert() or .update(). In such case, client of ContentResolver cannot catch the specific exception that is thrown by ContentProvider. \n\nReverted changes: /q/submissionid:30533261-LocalSimContactsWriteException\n\nChange-Id: Ic4e1d2e20c82169cc65f05801cfedc4f4e3577d4\n" }, { "commit": "319beef124911887fc92d5330ab07c8368475025", "tree": "41f7c1b15fd5d5efdf1cf6d5be6d597638b1f1e6", "parents": [ "87764471fdbdd3e62fa219e18a910e7ca3160c64" ], "author": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Tue Nov 26 15:02:10 2024 -0800" }, "committer": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Wed Nov 27 09:27:40 2024 -0800" }, "message": "Remove table creation guard for stale search contacts temp table\n\nGiven ContactsDatabaseHelper sets setIdleConnectionTimeout to 30\nseconds, the database connection will close if the no action occurs\nduring that period of time causing the temp table to be deleted.\nMeaning that mIsStaleSearchIndexTableCreated will be wrongly set if it\nwas already created. Given the database connection can close at any\nmoment simply try to recreate the temp table on each call.\n\nTest: atest CallLogPullRequestTest#updateTimesContacted_cursorIsClosed\nTest: atest ContactsProviderTests\nBug: 363260703\nBug: 367828825\nFlag: com.android.providers.contacts.flags.cp2_sync_search_index_flag\nChange-Id: I34c4cd91a7dad0faf6087b04cf9fc7f19fab9f0a\n" }, { "commit": "deb528ca1720407ec00d1357fe989a4cbdb69b7a", "tree": "b6b1a067ff007bd7655600c6e5db98bc41e01025", "parents": [ "0fcf507be154b1e8889c80c36a7ad60b26d7a411" ], "author": { "name": "Eric Lin", "email": "ericth@google.com", "time": "Tue Nov 26 07:14:03 2024 +0000" }, "committer": { "name": "Eric Lin", "email": "ericth@google.com", "time": "Tue Nov 26 07:14:03 2024 +0000" }, "message": "Update comments to point to the new location of event.logtags.\n\nevent.logtags was moved from system/core/logcat to system/logging/logcat in Android 12 by aosp/1454058.\n\nChange-Id: I24981d21401f1857b344bcef5d131a381aae84a4\nBUG: 168791309\nFlag: DOCS_ONLY\nTest: Local build\n" }, { "commit": "62764751c020067ccd1790d69387a1c4df3dbea7", "tree": "a254f91aab952d6f5dfcbe0de1536c5d74d24532", "parents": [ "87764471fdbdd3e62fa219e18a910e7ca3160c64" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Nov 21 11:06:36 2024 -0800" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Nov 21 15:20:44 2024 -0800" }, "message": "Migrated to the LocalSimContactsWriteException\n\nBug: 379303491\nTest: Manually tested on device to creat contacts\nFlag: android.provider.new_default_account_api_enabled\n\n modified: src/com/android/providers/contacts/AccountResolver.java\n modified: tests/src/com/android/providers/contacts/AccountResolverTest.java\n\nChange-Id: I379e0e7a8d0fc41679f1b2957c8fd2e4d3f535d9\n" }, { "commit": "87764471fdbdd3e62fa219e18a910e7ca3160c64", "tree": "b44cfd0221871551fe14dc54c792ca6e6e13e57b", "parents": [ "9e82ff83636b5a417575d26baea5f8d78c9a0b7b" ], "author": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Tue Nov 19 20:44:26 2024 +0000" }, "committer": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Tue Nov 19 22:44:03 2024 +0000" }, "message": "Flag off deletion of Custom Data rows\n\nWe only move between very intentional account pairs, lets default to\nkeeping all data rows when doing a move.\n\nBug: b/330324156\nTest: MoveRawContactsTest\nFlag: com.android.providers.contacts.flags.cp2_account_move_delete_non_common_data_rows_flag\n\nChanges to be committed:\n\tmodified: contactsprovider_flags.aconfig\n\tmodified: src/com/android/providers/contacts/ContactMover.java\n\tmodified: tests/src/com/android/providers/contacts/MoveRawContactsTest.java\n\nChange-Id: I93f97a99a490863122ad98f7eb7b43394a2f704a\n" }, { "commit": "9e82ff83636b5a417575d26baea5f8d78c9a0b7b", "tree": "e1247387b76df07972535d5bbb8068dcfdde44ee", "parents": [ "9f179db2f74a74effd108b44e024b71d23a660f9", "fc435d37fd963f1d8d080f9fae32246cbd9d3c12" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Nov 18 17:41:34 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 18 17:41:34 2024 +0000" }, "message": "Merge \"Fixed the ContactsLookupKeyTest by combining the update operations of account name and account type (both to non-null) into a single operation.\" into main" }, { "commit": "fc435d37fd963f1d8d080f9fae32246cbd9d3c12", "tree": "e1247387b76df07972535d5bbb8068dcfdde44ee", "parents": [ "fbfa71f6675e3f1d3857395491581fe85b23ab8b" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Fri Nov 15 13:55:28 2024 -0800" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Fri Nov 15 19:07:16 2024 -0800" }, "message": "Fixed the ContactsLookupKeyTest by combining the update operations of account name and account type (both to non-null) into a single operation.\n\nPreviously, ContactsProvider requires new contacts with its account name\nand account type both set to null or set to non-null. However, it\ndoesn\u0027t enforce the same requirement when updating existing raw contacts.\nIn Android B, when flag new_default_account_api_enabled is enabled, the\nsame requirement is enforced in both creating new contacts and updating\nexisting raw contacts.\n\nBug: 379281002\nTest: atest ContactsProviderTests\nFlag: EXEMPTED\n\n\tmodified: tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java\n\tmodified: tests/src/com/android/providers/contacts/ContactLookupKeyTest.java\n\nChange-Id: Ie3bd3e7ab4c0a933f5d5a026a6899732f7abf482\n" }, { "commit": "9f179db2f74a74effd108b44e024b71d23a660f9", "tree": "752a85f10e292c67e0e4bf14421cf7f1d41a7d64", "parents": [ "fbfa71f6675e3f1d3857395491581fe85b23ab8b", "27b7c4c98427721baf53c034a5839f7f8e0b6e79" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Nov 14 01:12:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 14 01:12:25 2024 +0000" }, "message": "[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 27b7c4c984 -s ours\n\nam skip reason: Merged-In I0d93d5dca2b2c3102feaa72b49bb9e879bd47711 with SHA-1 48f5401c4d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/30283761\n\nChange-Id: I7f5be249b78350c535440ee79f83750e8e09393d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fbfa71f6675e3f1d3857395491581fe85b23ab8b", "tree": "752a85f10e292c67e0e4bf14421cf7f1d41a7d64", "parents": [ "6cbf5b7e8d918ed04b01e71b952663a1cc1e1c4c" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Nov 10 20:07:15 2024 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Nov 10 20:07:15 2024 -0800" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I067eb9c34610ea342a9470733becf25b95354976\n" }, { "commit": "27b7c4c98427721baf53c034a5839f7f8e0b6e79", "tree": "4f8e5932fea227f8bb8322eff085c3c4f3da21c4", "parents": [ "5c1b5e1f47f44664c61e8ffe80ee091ff8e59156", "48f5401c4d9eceea9e80892fa95e49448967233b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:35 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:35 2024 -0800" }, "message": "Merge 24Q4 (ab/12406339) into aosp-main-future\n\nBug: 370570306\nMerged-In: I0d93d5dca2b2c3102feaa72b49bb9e879bd47711\nChange-Id: I597c0152e9fd0712c3456e43dbdbf52be1490806\n" }, { "commit": "6cbf5b7e8d918ed04b01e71b952663a1cc1e1c4c", "tree": "a6b8d2a474bcfc985b0e08b0f9e0041dcc216f9d", "parents": [ "e25e73718d76efcc153fbf13def871d74f7b218a", "e57a15fb280767c20e1e719a252ba8a1ed9a3f0f" ], "author": { "name": "Dongzhuo Zhang", "email": "dongzhuozhang@google.com", "time": "Wed Nov 06 17:55:51 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 06 17:55:51 2024 +0000" }, "message": "Merge \"Fix the movable contacts condition check in MoveContactsToDefaultAccountActivity. The condition should be if the sum of local contacts and sim contacts is greater than 0, the dialog should be called.\" into main" }, { "commit": "e57a15fb280767c20e1e719a252ba8a1ed9a3f0f", "tree": "34140262bcda721d489c8b267abb196f90ef5d2a", "parents": [ "dc45e5a3dbf5302d458bcfdc12a94838b5a39298" ], "author": { "name": "Dongzhuo Zhang", "email": "dongzhuozhang@google.com", "time": "Tue Nov 05 00:05:27 2024 +0000" }, "committer": { "name": "Dongzhuo Zhang", "email": "dongzhuozhang@google.com", "time": "Tue Nov 05 00:05:55 2024 +0000" }, "message": "Fix the movable contacts condition check in MoveContactsToDefaultAccountActivity.\nThe condition should be if the sum of local contacts and sim contacts is greater than 0, the dialog should be called.\n\nBug:372551099\nTest:atest ContactsProviderTests:com.android.providers.contacts.MoveLocalContactsActivityTest\nFlag: android.provider.new_default_account_api_enabled\n\nChange-Id: I4c51f39b11b6c1a1f67b0f0a20d4007788880492\n" }, { "commit": "e25e73718d76efcc153fbf13def871d74f7b218a", "tree": "81ab61be0c5ccb037e2de638871beae61730f6f7", "parents": [ "d0501941d6655fb9350a3fbdbda97acbfc274535" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 30 14:20:17 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 30 14:20:17 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I6e5b9a52dc66ec9558131f917a81f472f64d5427\n" }, { "commit": "d0501941d6655fb9350a3fbdbda97acbfc274535", "tree": "aefc2d46387701e8c265e066519934bd9d97c24e", "parents": [ "fb48f83659b00eb60c0b571ab2cf55a32e087855", "9788f53cc645fb1812834f9d07be5fb4e5c023b5" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 30 02:27:59 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 30 02:27:59 2024 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main" }, { "commit": "fb48f83659b00eb60c0b571ab2cf55a32e087855", "tree": "77cb0d9aff7b39c3b607d72ff9893f5a7e9a517f", "parents": [ "dc45e5a3dbf5302d458bcfdc12a94838b5a39298", "9f99cfa97703d8901eb928a905804f991131133d" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Tue Oct 29 21:41:25 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 29 21:41:25 2024 +0000" }, "message": "Merge \"Disabled the raw contacts/group creation restriction when calling package\u0027s target SDK is below Android B.\" into main" }, { "commit": "9f99cfa97703d8901eb928a905804f991131133d", "tree": "3db8fa4078b7fa632a0967f1a9944d46f2abbb97", "parents": [ "fd2dad0759d76af29ee96eda3bdc8b9f73e0cbd2" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Tue Oct 15 09:22:30 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Tue Oct 29 13:20:37 2024 -0700" }, "message": "Disabled the raw contacts/group creation restriction when calling package\u0027s target SDK is below\nAndroid B.\n\nTo continue allowing Apps targetting pre-Android B saves contacts as if\nthey did before, ContactsProvder will only enforce raw contacts/group\ncreation restriction when App is targetting Android B and above.\n\nBug: 361580180\nBug: 352312780\nTest: manually test + unit test\nFlag: android.provider.new_default_account_api_enabled\n\n\tmodified: src/com/android/providers/contacts/AccountResolver.java\n\tmodified: src/com/android/providers/contacts/ContactsProvider2.java\n modified: tests/Android.bp\n modified: tests/src/com/android/providers/contacts/AccountResolverTest.java\n modified: tests/src/com/android/providers/contacts/ContactsProvider2DefaultAccountTest.java\n\nChange-Id: Ibe5ba2e9721d4d478df49c1aef0f369e818a5b78\n" }, { "commit": "9788f53cc645fb1812834f9d07be5fb4e5c023b5", "tree": "c501a5a662ff9133629963f4c80aed598436cb28", "parents": [ "dc45e5a3dbf5302d458bcfdc12a94838b5a39298" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Oct 29 06:13:09 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Oct 29 06:13:09 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Id5a118badb0286e22e0e089f606816f03801c55c\n" }, { "commit": "dc45e5a3dbf5302d458bcfdc12a94838b5a39298", "tree": "e71966082c3d68cbb81d20afc18a654909325309", "parents": [ "21e1afbd32a49b8b9238573d5fae2bc54673c94d" ], "author": { "name": "Dongzhuo Zhang", "email": "dongzhuozhang@google.com", "time": "Wed Oct 23 23:47:45 2024 +0000" }, "committer": { "name": "Dongzhuo Zhang", "email": "dongzhuozhang@google.com", "time": "Wed Oct 23 23:47:45 2024 +0000" }, "message": "Create MoveContactsToDefaultAccountActivity class to support moving all local\ncontacts to cloud account.(Including device and sim contacts).\n\nBug:372551099\nTest:atest ContactsProviderTests:com.android.providers.contacts.MoveLocalContactsActivityTest\nFlag: android.provider.new_default_account_api_enabled\n\nChange-Id: Idaebbbec806d3585568dbe9237fd4674510ef807\n" }, { "commit": "21e1afbd32a49b8b9238573d5fae2bc54673c94d", "tree": "3eb76771c39a7c09d9343c754b3952801a424d08", "parents": [ "fd2dad0759d76af29ee96eda3bdc8b9f73e0cbd2" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 17 21:31:43 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 17 21:31:43 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\n\nBUG: 374102389\nChange-Id: I5784a77d89bd1f2270ed493bba0970e3edb4dbab\n" }, { "commit": "fd2dad0759d76af29ee96eda3bdc8b9f73e0cbd2", "tree": "1d74383af4100171930d18674f898805fe36bb88", "parents": [ "31cedcaadeaead5b52f76b05f048ee27f35e747b", "de728ae67ee4e62eb68e3107271ea7187194aacb" ], "author": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Tue Oct 15 21:26:50 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 15 21:26:50 2024 +0000" }, "message": "Merge \"Use an sqlite TEMP TABLE for search index contact id invalidation\" into main" }, { "commit": "31cedcaadeaead5b52f76b05f048ee27f35e747b", "tree": "ecca24dd413c6caf28f28111ef53d3a8d20c89f0", "parents": [ "f0cac378d17844a3cd6a01cf514bec0ee0c90484", "6009462f4e9e4df18f02a2de802f7e34f2c50f68" ], "author": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Mon Oct 14 18:13:36 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 14 18:13:36 2024 +0000" }, "message": "Merge \"Add flag to disable moves to ineligible Cloud DCA\" into main" }, { "commit": "f0cac378d17844a3cd6a01cf514bec0ee0c90484", "tree": "907b357d648e748fd9aefb019e69e80208a812b2", "parents": [ "5f82add6b3a3614302f02b375635196258898075", "9fe6a9df8532ba4cb0e4f52277d19d1d52269ae3" ], "author": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Mon Oct 14 18:05:32 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 14 18:05:32 2024 +0000" }, "message": "Merge \"Always return a bundle from get number methods\" into main" }, { "commit": "5f82add6b3a3614302f02b375635196258898075", "tree": "26085d93ffcebfabae87b66cd15916aa9da2bd6d", "parents": [ "f5f47227aa9a4a2035eb47374a7eef2763497db8", "5c1b5e1f47f44664c61e8ffe80ee091ff8e59156" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Oct 14 17:16:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 14 17:16:36 2024 +0000" }, "message": "Merge \"Updated the ContactsProvider\u0027s owners.\" into main am: 0fcf507be1 am: 5c1b5e1f47\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3308058\n\nChange-Id: I2a571a9198ab98cbc17d7d63d72cee5e6d255480\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5c1b5e1f47f44664c61e8ffe80ee091ff8e59156", "tree": "fa48116a7dca503515dc76aa2aafdeec2264092e", "parents": [ "e118fb59d0867317497501b6e398e01396de3308", "0fcf507be154b1e8889c80c36a7ad60b26d7a411" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Oct 14 16:55:51 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 14 16:55:51 2024 +0000" }, "message": "Merge \"Updated the ContactsProvider\u0027s owners.\" into main am: 0fcf507be1\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3308058\n\nChange-Id: I926d04e070ddfb01c0875d438d6cb91efb7e1f3e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0fcf507be154b1e8889c80c36a7ad60b26d7a411", "tree": "fa48116a7dca503515dc76aa2aafdeec2264092e", "parents": [ "9c75be906a02cd46fc0017add2ac008098c0780e", "26f316d9484823c89f2f923d15ec08fe6aa1833d" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Oct 14 16:28:52 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 14 16:28:52 2024 +0000" }, "message": "Merge \"Updated the ContactsProvider\u0027s owners.\" into main" }, { "commit": "26f316d9484823c89f2f923d15ec08fe6aa1833d", "tree": "fa48116a7dca503515dc76aa2aafdeec2264092e", "parents": [ "9c75be906a02cd46fc0017add2ac008098c0780e" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Oct 14 15:40:57 2024 +0000" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Oct 14 16:16:23 2024 +0000" }, "message": "Updated the ContactsProvider\u0027s owners.\n\nChange-Id: I3ede9df574c476c77b795c0a36bebe894c70fc42\n" }, { "commit": "9fe6a9df8532ba4cb0e4f52277d19d1d52269ae3", "tree": "52430ccc4aa0b4348500451858d4e1051e34d739", "parents": [ "f5f47227aa9a4a2035eb47374a7eef2763497db8" ], "author": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Fri Oct 11 00:28:14 2024 +0000" }, "committer": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Fri Oct 11 05:47:27 2024 +0000" }, "message": "Always return a bundle from get number methods\n\nAlways return an empty bundle from getNumberOfMovableContacts methods,\nrather than returning null when the flags are disabled.\nThis allows us to no-op when the flag is disabled, but prevents the\ncaller from potentially receiving an unexpected null.\n\nBug: b/372733513\nTest: atest android.provider.cts.contacts.ContactsContract_MoveToCloudDeviceContactsAccount\nFlag: android.provider.new_default_account_api_enabled\n\n Changes to be committed:\n\tmodified: src/com/android/providers/contacts/ContactsProvider2.java\n\nChange-Id: I4849646bf548ea288826e9e7f419f1555bccfe25\n" }, { "commit": "6009462f4e9e4df18f02a2de802f7e34f2c50f68", "tree": "905fe281540107a17b338a48c416bc2fc4821134", "parents": [ "f5f47227aa9a4a2035eb47374a7eef2763497db8" ], "author": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Tue Oct 08 23:43:09 2024 +0000" }, "committer": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Thu Oct 10 21:53:22 2024 +0000" }, "message": "Add flag to disable moves to ineligible Cloud DCA\n\nAdds a flag to disable the CP2 Move API for moves to invalid or\nunsupported Cloud Default Accounts\n\nBug: b/372270980\nTest: MoveRawContactsTest\nFlag: com.android.providers.contacts.flags.disable_move_to_ineligible_default_account_flag\n\n Changes to be committed:\n\tmodified: contactsprovider_flags.aconfig\n\tmodified: src/com/android/providers/contacts/ContactMover.java\n\tmodified: tests/src/com/android/providers/contacts/MoveRawContactsTest.java\n\nChange-Id: Icffeb12a50a86800ddff08eb184ac52e22fa395f\n" }, { "commit": "f5f47227aa9a4a2035eb47374a7eef2763497db8", "tree": "17fbbf6aaa7646b42aa177c11fa540aaeffdc803", "parents": [ "fb912660889cd27932f7477ab280b2cd69660fd7" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Fri Oct 04 14:37:18 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Tue Oct 08 13:24:52 2024 -0700" }, "message": "Support SIM to be a default account in CP2.\n\nBug: 368127857\nTest: unit tests (atest ContactsProviderTestsWithAllFlagEnabled:com.android.providers.contacts.ContactsProvider2DefaultAccountTest)\nFlag:android.provider.new_default_account_api_enabled\n\n\tmodified: src/com/android/providers/contacts/ContactsProvider2.java\n\tmodified: src/com/android/providers/contacts/DefaultAccountManager.java\n modified: tests/src/com/android/providers/contacts/ContactsProvider2DefaultAccountTest.java\n modified: tests/src/com/android/providers/contacts/DefaultAccountManagerTest.java\n\nChange-Id: I22e77e52f07fb8f6245fa0258ffa669afbb07b01\n" }, { "commit": "fb912660889cd27932f7477ab280b2cd69660fd7", "tree": "14d4e85c93411f88612dbd86980e4270c3db621d", "parents": [ "bcae0a2ae84d90f0dc38c9ffb618fbf4bfec7024", "ee996d711eeb62e44a0e91d6195e9d3362955a53" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Oct 07 21:33:04 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 07 21:33:04 2024 +0000" }, "message": "Merge \"Implement the CP2 handler of DefaultAccount.getEligibleCloudAccounts\" into main" }, { "commit": "ee996d711eeb62e44a0e91d6195e9d3362955a53", "tree": "de57ed766c5fe0c375b075e9e51e4cf8ee9d1133", "parents": [ "8e610cc3ef365822846dfea600dc85037983c178" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Sep 26 07:39:42 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Fri Oct 04 06:55:27 2024 -0700" }, "message": "Implement the CP2 handler of DefaultAccount.getEligibleCloudAccounts\n\nBug: 352313110,364637693,359957924\nFix: 359957924\nTest: added new test\nFlag: android.provider.new_default_account_api_enabled\nAPI-Coverage-Bug: 369343261\n\n\tmodified: src/com/android/providers/contacts/ContactsProvider2.java\n\tmodified: src/com/android/providers/contacts/DefaultAccountManager.java\n\tmodified: tests/src/com/android/providers/contacts/ContactsProvider2DefaultAccountTest.java\n\tmodified: tests/src/com/android/providers/contacts/DefaultAccountManagerTest.java\n\nChange-Id: I885702ed970768c7a66bbd3a4d645571f974736a\n" }, { "commit": "bcae0a2ae84d90f0dc38c9ffb618fbf4bfec7024", "tree": "bb7e609f971fe9d49e34c8d22a45db2d00950cc8", "parents": [ "8e610cc3ef365822846dfea600dc85037983c178" ], "author": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Thu Sep 19 22:31:38 2024 +0000" }, "committer": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Thu Oct 03 22:27:12 2024 +0000" }, "message": "Support calling the CP2 Move API\n\nAdds support for calls to the CP2 Move API\n\nBug: b/330324156\nTest: MoveRawContactsTest\nFlag: com.android.providers.contacts.flags.cp2_account_move_flag\n\n Changes to be committed:\n\tmodified: src/com/android/providers/contacts/ContactsProvider2.java\n\nChange-Id: I85ab406d49d3bf28514596cf279b51d5e6351a82\n" }, { "commit": "8e610cc3ef365822846dfea600dc85037983c178", "tree": "ca527925340a2b560d9971c92b251a0b496afed7", "parents": [ "6d075aac5f6a54711a016d632201036037216748" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Sep 16 13:17:14 2024 -0700" }, "committer": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Thu Oct 03 22:27:06 2024 +0000" }, "message": "Implemented the CP2\u0027s handler of setDefaultAccountForNewContacts and\ngetDefaultAccountForNewContacts API.\n\nBug: 357114100,352313110,364637693\nTest: added new test\nFlag: com.android.providers.contacts.flags.enable_new_default_account_rule_flag\n\n\tmodified: src/com/android/providers/contacts/ContactsProvider2.java\n\tmodified: src/com/android/providers/contacts/DefaultAccountManager.java\n modified: tests/src/com/android/providers/contacts/ContactsActor.java\n new file: tests/src/com/android/providers/contacts/ContactsProvider2DefaultAccountTest.java\n\nChange-Id: I81714bc708c8b41631568790fe31f2f03fda631c\n" }, { "commit": "6d075aac5f6a54711a016d632201036037216748", "tree": "7b6846823eb66218647a673cc13ab3290008ee02", "parents": [ "93855a8ab89a47226f496672c4450e41a952aa53", "db25b754cd6a4ec905b1a59fb77b324a426f1b89" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Oct 03 15:39:34 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 03 15:39:34 2024 +0000" }, "message": "Merge \"Allows the non-eligible cloud account being set as default account.\" into main" }, { "commit": "93855a8ab89a47226f496672c4450e41a952aa53", "tree": "ddbc273a0f4ca97d68e4c681bdd557918ab75180", "parents": [ "cc30d3e50e21e2a3e04442df8192ce09a76ac4d6", "67e7ea06525f09c2bef108bca74c87f7ad2ad559" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Oct 03 14:16:31 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 03 14:16:31 2024 +0000" }, "message": "Merge \"Allow contact insertion without account being specified, when default account is not set. Contact insertion in this situation will continue to be stored in the local account.\" into main" }, { "commit": "db25b754cd6a4ec905b1a59fb77b324a426f1b89", "tree": "5f7065041b66680f6a895e47cc8ce7ed1b53f47f", "parents": [ "6c8f9d0bbd6a78bef5d2e4e721f185ab2595c0e2" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Wed Oct 02 15:19:28 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Wed Oct 02 21:54:07 2024 -0700" }, "message": "Allows the non-eligible cloud account being set as default account.\n\nBug: 370090750\nTest: unit test\nFlag: android.provider.new_default_account_api_enabled\n\n\tmodified: src/com/android/providers/contacts/DefaultAccountManager.java\n\tmodified: tests/src/com/android/providers/contacts/DefaultAccountManagerTest.java\n modified: tests/src/com/android/providers/contacts/MoveRawContactsTest.java\n\nChange-Id: Iae5ae043c9df121ed179ca99a382080d22ddcdcb\n" }, { "commit": "cc30d3e50e21e2a3e04442df8192ce09a76ac4d6", "tree": "3790a3526800384a475077218c3c9abcfeeb4283", "parents": [ "2d02379d54311aafbe342d467bedc31f62922344", "698cc183d10b01728da2c5b63069157d21190149" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Wed Oct 02 16:08:02 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 02 16:08:02 2024 +0000" }, "message": "Merge \"Fixed the double-initialization of ContactsProvider2.mDefaultAccountManager and ContactsProvider2.mAccountResolver\" into main" }, { "commit": "2d02379d54311aafbe342d467bedc31f62922344", "tree": "5ecbf5c9b904b469f7f6b77d47ea5e470c84139a", "parents": [ "6c8f9d0bbd6a78bef5d2e4e721f185ab2595c0e2", "e118fb59d0867317497501b6e398e01396de3308" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Wed Oct 02 00:57:22 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 02 00:57:22 2024 +0000" }, "message": "Merge \"Update MockTelephonyManager to align with the method being overriden\" into main am: 9c75be906a am: e118fb59d0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3285261\n\nChange-Id: I0fced8f8eb97827d61d504f727a038557779e895\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e118fb59d0867317497501b6e398e01396de3308", "tree": "72f0fed0e14cc91c84d5377202048a6ac97f0e1d", "parents": [ "e480fc657e01349cf12a9e955c2fdcbe9a9b13a1", "9c75be906a02cd46fc0017add2ac008098c0780e" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Wed Oct 02 00:32:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 02 00:32:52 2024 +0000" }, "message": "Merge \"Update MockTelephonyManager to align with the method being overriden\" into main am: 9c75be906a\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3285261\n\nChange-Id: I01a8a43ad0e9c0f8310c757aa5d032fa2de94f11\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9c75be906a02cd46fc0017add2ac008098c0780e", "tree": "72f0fed0e14cc91c84d5377202048a6ac97f0e1d", "parents": [ "1d0dae7bf093568636fce31dba3654687ebe6fdb", "c1f57b2f48a57b4c9684dc3fd1a1a96af808a0d7" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Oct 01 23:59:21 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 01 23:59:21 2024 +0000" }, "message": "Merge \"Update MockTelephonyManager to align with the method being overriden\" into main" }, { "commit": "698cc183d10b01728da2c5b63069157d21190149", "tree": "eed58db3d8409d198f2d389ad4f60ee8371bd5cd", "parents": [ "6c8f9d0bbd6a78bef5d2e4e721f185ab2595c0e2" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Fri Sep 13 23:59:46 2024 +0000" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Tue Oct 01 22:31:30 2024 +0000" }, "message": "Fixed the double-initialization of ContactsProvider2.mDefaultAccountManager and ContactsProvider2.mAccountResolver\n\nBug: 366578422\nTest: relying on presubmit\nFlag: EXEMPT trivial member initialization fix\n\nChange-Id: I8a896866555209b673eb19b98eb38177525ed87d\n" }, { "commit": "67e7ea06525f09c2bef108bca74c87f7ad2ad559", "tree": "c282dc4acfbc8169ab0d4ae277596ce9b4c7e814", "parents": [ "6c8f9d0bbd6a78bef5d2e4e721f185ab2595c0e2" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Tue Oct 01 13:04:59 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Tue Oct 01 13:46:30 2024 -0700" }, "message": "Allow contact insertion without account being specified, when default\naccount is not set. Contact insertion in this situation will continue to be\nstored in the local account.\n\nBug: 370546019\nTest: unit test and CTS test\nFlag: android.provider.new_default_account_api_enabled\n\nContacts insertion without acccount being specified, historically stores\nthe contact in the local account. In Android B, while it is strongly discouraged to\ninsert contact without account being sepcified, CP2 should not forbid\nthis, or otherwise it might break the apps which already operates in this mode.\n\n\tmodified: src/com/android/providers/contacts/AccountResolver.java\n\tmodified: tests/src/com/android/providers/contacts/AccountResolverTest.java\n\nChange-Id: I4a054ec21567b4c1dc0005e4ce1132c4d8e18bb2\n" }, { "commit": "de728ae67ee4e62eb68e3107271ea7187194aacb", "tree": "ac1b3f67762b4ab6a530098975cefe72756ff6ce", "parents": [ "6c8f9d0bbd6a78bef5d2e4e721f185ab2595c0e2" ], "author": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Mon Sep 23 12:10:33 2024 -0700" }, "committer": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Tue Oct 01 09:48:43 2024 -0700" }, "message": "Use an sqlite TEMP TABLE for search index contact id invalidation\n\nRefactored CP2 to use an sqlite TEMP TABLE, instead of two sets for\ncaching the invalidated search index contact ids. Also, fixed bug where\nsearch index table was not being updated when raw contacts are deleted\ndirectly through the ContactsProvider\u0027s delete operation.\n\nTest: atest ContactsProviderTests\nFlag: com.android.providers.contacts.flags.cp2_sync_search_index_flag\nBug: 367828825\nChange-Id: Ibccfee892453cb963fa15697576b09dcd534614d\n" }, { "commit": "6c8f9d0bbd6a78bef5d2e4e721f185ab2595c0e2", "tree": "0cb57de2e87ca659fccb784d4b87a8c3d8df820f", "parents": [ "6cb0a7fe35747d5b0ba9d8410bb07e75ccfbf886", "20af60ced66e25951b472eae1f6776e4aeed9235" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Sep 30 15:34:50 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 30 15:34:50 2024 +0000" }, "message": "Merge \"Switch the CP2 new default account rule implementation\u0027s flag from com.android.providers.contacts.flags.enable_new_default_account_rule_flag to android.provider.new_default_account_api_enabled, such that the API and implementation will be enabled/disabled by the same flag.\" into main" }, { "commit": "c1f57b2f48a57b4c9684dc3fd1a1a96af808a0d7", "tree": "72f0fed0e14cc91c84d5377202048a6ac97f0e1d", "parents": [ "1d0dae7bf093568636fce31dba3654687ebe6fdb" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Thu Sep 26 17:05:35 2024 -0700" }, "committer": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Thu Sep 26 17:31:49 2024 -0700" }, "message": "Update MockTelephonyManager to align with the method being overriden\n\nSignature of TelephonyManager#getPackagesWithCarrierPrivileges\nhas changed. This patch updates MockTelephonyManager to be aligned\nwith that change.\n\nBug: 366598445\nBug: 367831385\nTest: atest CtsTelephonyTestCases:TelephonyManagerTest\nTest: atest ContactsProviderTests\nFlag: android.os.mainline_vcn_platform_api\nChange-Id: I541bd4eb29abf970ff653c07b6c850dbd73dc8ff\n" }, { "commit": "20af60ced66e25951b472eae1f6776e4aeed9235", "tree": "f068c22e53c011011e780e9b69720dd2c43a1cf5", "parents": [ "48f5401c4d9eceea9e80892fa95e49448967233b" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Wed Sep 25 11:53:45 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Sep 26 17:25:18 2024 +0000" }, "message": "Switch the CP2 new default account rule implementation\u0027s flag from\ncom.android.providers.contacts.flags.enable_new_default_account_rule_flag to android.provider.new_default_account_api_enabled, such that the API and implementation will be enabled/disabled\nby the same flag.\n\nBug: 369647373\nTest: run unit tests.\nFlag: android.provider.new_default_account_api_enabled\n\n\tmodified: Android.bp\n\tmodified: src/com/android/providers/contacts/ContactsProvider2.java\n\tmodified: tests/Android.bp\n\nChange-Id: If96b66321e7cdb268c685034be299a0b3bdf5a61\n" }, { "commit": "6cb0a7fe35747d5b0ba9d8410bb07e75ccfbf886", "tree": "a21f8982f33637ee88f60c995afd847f9dc9878d", "parents": [ "48f5401c4d9eceea9e80892fa95e49448967233b" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Sep 23 11:22:18 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Wed Sep 25 09:03:28 2024 -0700" }, "message": "Switch the ContactsProvider from using internal DeaultAccount class to\nContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState.\n\nBug: 346567286\nTest: ContactsProviderTests\nFlag: EXEMPT pure refactoring\n\n\tmodified: src/com/android/providers/contacts/AccountResolver.java\n\tmodified: src/com/android/providers/contacts/ContactMover.java\n\tdeleted: src/com/android/providers/contacts/DefaultAccount.java\n\tmodified: src/com/android/providers/contacts/DefaultAccountManager.java\n\tmodified: tests/src/com/android/providers/contacts/AccountResolverTest.java\n\tmodified: tests/src/com/android/providers/contacts/DefaultAccountManagerTest.java\n\tmodified: tests/src/com/android/providers/contacts/MoveRawContactsTest.java\n\nChange-Id: Iab96080f82fb02a0e7bad30dcee5802d03fa1500\n" }, { "commit": "48f5401c4d9eceea9e80892fa95e49448967233b", "tree": "6acd8ebb6ebdea9b923e0b7c572032d18a1481c6", "parents": [ "6098b5605392a1e7bd09b8bf1adb20c11633a7b1" ], "author": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Thu Sep 12 19:30:04 2024 +0000" }, "committer": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Wed Sep 18 21:07:28 2024 +0000" }, "message": "Add methods to get number of contacts for DCA move\n\nThese allow callers to know how many contacts could be moved using the\nmoveLocalToCloudDefaultAccount and moveSimToCloudDefaultAccount methods.\n\nBug: b/330324156\nTest: MoveRawContactsTest\nFlag: com.android.providers.contacts.flags.cp2_account_move_flag\n\n Changes to be committed:\n\tmodified: src/com/android/providers/contacts/ContactMover.java\n\tmodified: src/com/android/providers/contacts/ContactsDatabaseHelper.java\n\tmodified: tests/src/com/android/providers/contacts/MoveRawContactsTest.java\n\nChange-Id: I0d93d5dca2b2c3102feaa72b49bb9e879bd47711\n" }, { "commit": "6098b5605392a1e7bd09b8bf1adb20c11633a7b1", "tree": "0257bf2d3e17ac5ff6ad13f1c04dcbe2c2f65116", "parents": [ "0440888ee5ab06de53353abfa0eac89cb067471b", "8c37a460c05cd782d77010f8abaaa7e09e58f5c1" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Wed Sep 18 01:06:25 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 18 01:06:25 2024 +0000" }, "message": "Merge \"Move the string array of \"eligible system cloud account types\" from CP2 arrays.xml to the system config. Also leave the value as empty.\" into main" }, { "commit": "0440888ee5ab06de53353abfa0eac89cb067471b", "tree": "e57c293476c6b44e9fefcd76915b7480ad19dcd2", "parents": [ "839bb90298c76c039f9b9e9095eb504be60f2bc6", "767f503614c0df657e825b4eed04b619e1bb9009" ], "author": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Wed Sep 18 00:08:01 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 18 00:08:01 2024 +0000" }, "message": "Merge \"Update search_index table on account removal and contact aggregation\" into main" }, { "commit": "8c37a460c05cd782d77010f8abaaa7e09e58f5c1", "tree": "e7d923f4b02dd2bfc30111c0b3f7a109611b538d", "parents": [ "839bb90298c76c039f9b9e9095eb504be60f2bc6" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Aug 29 21:26:09 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Tue Sep 17 16:29:11 2024 -0700" }, "message": "Move the string array of \"eligible system cloud account types\" from CP2\narrays.xml to the system config. Also leave the value as empty.\n\nBug: b/346567286\nTest: Unit test\nFlag:com.android.providers.contacts.flags.enable_new_default_account_rule_flag\n\n\tdeleted: res/values/arrays.xml\n\tmodified: src/com/android/providers/contacts/DefaultAccount.java\n\tmodified: src/com/android/providers/contacts/DefaultAccountManager.java\n\tmodified: tests/src/com/android/providers/contacts/DefaultAccountManagerTest.java\n\nChange-Id: Idb8059c744d843382da9e9860c0e1d1021563b85\n" }, { "commit": "839bb90298c76c039f9b9e9095eb504be60f2bc6", "tree": "a981346e4c34a49f4fa15bbed6c3f8acaf74006c", "parents": [ "a37e5c0a755e6485eb6e6baffd3d83fe0e6b78cc" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Aug 29 11:17:00 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Tue Sep 17 11:31:22 2024 -0700" }, "message": "Updated the DefaultAccountManager\u0027s method, to simplify the default\naccount (DCA)\u0027s updating and invalidation policy, including:\n\nBug: b/356383714\nTest: unit tests\nFlag:com.android.providers.contacts.flags.enable_new_default_account_rule_flag\n\n1. Stop auto-assign the DCA to \"device\", When there is no system cloud account. Instead, it should be \"unknown\" by default.\n2. Allow updating the DCA from \"cloud\" to \"device\".\n3. When updating the DCA to \"device\", do not unsync any cloud account.\n4. Allow updating the DCA to \"unknown\".\n\n\tmodified: src/com/android/providers/contacts/DefaultAccount.java\n\tmodified: src/com/android/providers/contacts/DefaultAccountManager.java\n\tmodified: tests/src/com/android/providers/contacts/DefaultAccountManagerTest.java\n\nChange-Id: Iba7a49fed5af0f5756a270d1f65f2f31fd7836b9\n" }, { "commit": "a37e5c0a755e6485eb6e6baffd3d83fe0e6b78cc", "tree": "8bf4a84be71e97aa205a90f5b2eab63db29d0fc6", "parents": [ "a0c6102391ab2e3feb3ae2ad5e107846483573a0", "e480fc657e01349cf12a9e955c2fdcbe9a9b13a1" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Sep 16 20:12:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 16 20:12:17 2024 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main am: 1d0dae7bf0 -s ours am: e480fc657e -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3263853\n\nChange-Id: I57ea9281e9e9ff524fdd23d1c0dc0e0e2ef2fc70\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a0c6102391ab2e3feb3ae2ad5e107846483573a0", "tree": "8bf4a84be71e97aa205a90f5b2eab63db29d0fc6", "parents": [ "8f800bc7a7c2a6891cbd5f9646c15891a10d97b0", "f227f453abde65207ecd9c7a79fa0cef56395119" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Sep 16 20:12:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 16 20:12:05 2024 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 68da96039c -s ours am: f227f453ab -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3263853\n\nChange-Id: I0c73061c8fcc241a34f69c74d3a9db28b47a58e5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e480fc657e01349cf12a9e955c2fdcbe9a9b13a1", "tree": "5db8661203e242b2c4f12b808a3965118b4763a0", "parents": [ "f227f453abde65207ecd9c7a79fa0cef56395119", "1d0dae7bf093568636fce31dba3654687ebe6fdb" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Sep 16 19:46:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 16 19:46:56 2024 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main am: 1d0dae7bf0 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3263853\n\nChange-Id: I966b8bd754d8de355e63bde538bf54bd3d8ac6aa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f227f453abde65207ecd9c7a79fa0cef56395119", "tree": "5db8661203e242b2c4f12b808a3965118b4763a0", "parents": [ "8704df95474579951e72d5355eb41f499158e03f", "68da96039c887e1e9e5a9e755d0e6b65e44d7d99" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Sep 16 19:46:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 16 19:46:20 2024 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 68da96039c -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3263853\n\nChange-Id: Ic856e0b1aa092334f5955f005e8d0b8fa55a44c2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1d0dae7bf093568636fce31dba3654687ebe6fdb", "tree": "5db8661203e242b2c4f12b808a3965118b4763a0", "parents": [ "a6d9a74768e77e80dc37bf4e61150dc69cc7539a", "68da96039c887e1e9e5a9e755d0e6b65e44d7d99" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Sep 16 19:11:07 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 16 19:11:07 2024 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main" }, { "commit": "8f800bc7a7c2a6891cbd5f9646c15891a10d97b0", "tree": "8bf4a84be71e97aa205a90f5b2eab63db29d0fc6", "parents": [ "14b25a2e676d035a36daf26a1a95f84a3421d039", "29f467bfe0004a9b3612503d23f5bc0651b7244c" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Mon Sep 16 16:40:35 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 16 16:40:35 2024 +0000" }, "message": "Merge \"Added the ContactsProviderTests test modules such that the tests can run under the flag all-on and all-off mode.\" into main" }, { "commit": "29f467bfe0004a9b3612503d23f5bc0651b7244c", "tree": "bb24de680cf09fb89203ebc407194647679e67a9", "parents": [ "e264b244594e7b55dc6bf865fc7c7ed3c4a8c99c" ], "author": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Sep 12 16:52:32 2024 -0700" }, "committer": { "name": "Liefu Liu", "email": "liefuliu@google.com", "time": "Thu Sep 12 17:33:09 2024 -0700" }, "message": "Added the ContactsProviderTests test modules such that the tests can run\nunder the flag all-on and all-off mode.\n\nBug: 366309709\nTest: Ran the test\nFlag:com.android.providers.contacts.flags.enable_new_default_account_rule_flag\n\n\tmodified: tests/Android.bp\n\tmodified: tests/AndroidTest.xml\n\nChange-Id: Ic8a21b48c2a6cd6d045530f497f6aa371cabb101\n" }, { "commit": "14b25a2e676d035a36daf26a1a95f84a3421d039", "tree": "c1cb4f0c03fae21965a17b62ce51de531c02b129", "parents": [ "e264b244594e7b55dc6bf865fc7c7ed3c4a8c99c", "454b69afbbd21f2a7aee0670db8d7201fcced47b" ], "author": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Thu Sep 12 19:40:01 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 12 19:40:01 2024 +0000" }, "message": "Merge \"Add DCA Move method\" into main" }, { "commit": "454b69afbbd21f2a7aee0670db8d7201fcced47b", "tree": "c1cb4f0c03fae21965a17b62ce51de531c02b129", "parents": [ "b3fef8806652994f9ee4323ff3d71849ae920818" ], "author": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Wed Sep 04 19:44:26 2024 +0000" }, "committer": { "name": "Christopher Werner", "email": "cmwerner@google.com", "time": "Thu Sep 12 17:53:13 2024 +0000" }, "message": "Add DCA Move method\n\nWe\u0027ll want a method specifically to perform the DCA contact move\n\nBug: b/330324156\nTest: MoveRawContactsTest\nFlag: com.android.providers.contacts.flags.cp2_account_move_flag\n\n Changes to be committed:\n\tmodified: src/com/android/providers/contacts/ContactMover.java\n\tmodified: tests/src/com/android/providers/contacts/MoveRawContactsTest.java\n\nChange-Id: I474dc6dd939a885209d511c6051be66ec577a7f8\n" }, { "commit": "767f503614c0df657e825b4eed04b619e1bb9009", "tree": "2e571c51f27df99d78f820ca383330341fac39a4", "parents": [ "a96267a5b3e897321be2dbdbbf53af0514b6460f" ], "author": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Fri Aug 30 09:51:53 2024 -0700" }, "committer": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Wed Sep 11 18:43:48 2024 -0700" }, "message": "Update search_index table on account removal and contact aggregation\n\nWhen an account is removed all of its data is removed including its\ncontacts. Previously in removeDataOfAccount the contacts were removed\nfrom the raw_contacts table, but not from the search_index table.\nRefactored the method such that the deleted contacts are removed from\nthe search index and contacts who had a raw contact removed are updated\nin the search index.\n\nToo handle the case where there is an excessive amount of contacts (\u003e5K)\nwhich need to be deleted from the search index, we simply clear the\nsearch_index table and rebuild it.\n\nAlso, updated the contacts aggregation logic such that it removes\nobsolete contact ids from the search index once a raw contact is\nupdated with the contact id of the new aggregated contact. Previously,\nthe aggregator would only delete the contact id from the contacts table\nbut wouldn\u0027t update the search index table. This resulted in duplicating\nmany rows in the search index.\n\nAlso, updated ContactsProvider2Test to use AndroidJUnit4 test runner in\norder to use feature flag annotations.\n\nTest: atest ContactsProviderTests\nBug: 363260703\nFlag: com.android.providers.contacts.flags.cp2_sync_search_index_flag\nChange-Id: I9992ad02bae68bc46ad3b2f5aababbde091ca5d1\n" }, { "commit": "e264b244594e7b55dc6bf865fc7c7ed3c4a8c99c", "tree": "9b6e25605eef5875443525b6a0b74119bb43a212", "parents": [ "b3fef8806652994f9ee4323ff3d71849ae920818", "8704df95474579951e72d5355eb41f499158e03f" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Sep 11 23:44:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 11 23:44:36 2024 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8704df9547 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/29359213\n\nChange-Id: I1e74e364f52502975b7d9527c70b808e0fc84aa5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8704df95474579951e72d5355eb41f499158e03f", "tree": "5db8661203e242b2c4f12b808a3965118b4763a0", "parents": [ "e1b8e9349adc763c6921ed7ffe08fa8ce7d923dc" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Sep 11 11:57:06 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Sep 11 11:57:06 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I5adab935314f7d1a1a6e418970ce38293c75013c\n" }, { "commit": "68da96039c887e1e9e5a9e755d0e6b65e44d7d99", "tree": "5db8661203e242b2c4f12b808a3965118b4763a0", "parents": [ "a6d9a74768e77e80dc37bf4e61150dc69cc7539a" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Sep 11 11:51:24 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Sep 11 11:51:24 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I4facefbc9931e61cb93b8f32b783a0633086c76d\n" }, { "commit": "b3fef8806652994f9ee4323ff3d71849ae920818", "tree": "9b6e25605eef5875443525b6a0b74119bb43a212", "parents": [ "0e5f16253cce530b9eb6e1bed1ae230e652407c5", "e1b8e9349adc763c6921ed7ffe08fa8ce7d923dc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 04:26:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 04:26:02 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: a6d9a74768 -s ours am: e1b8e9349a -s ours\n\nam skip reason: Merged-In Ie5d18887184068f7022676e484ed5f7363422a83 with SHA-1 f7b329f602 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3258358\n\nChange-Id: I40b746ee2716b058146b77c55ebd0f089fdb1a2d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e5f16253cce530b9eb6e1bed1ae230e652407c5", "tree": "9b6e25605eef5875443525b6a0b74119bb43a212", "parents": [ "95b79ab168428a7e7551cdcb052d7f758ffd7bda", "ecb06d1baf466d5330bc31cea5e68ebe49007b93" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 04:25:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 04:25:58 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 68bd02ba29 -s ours am: ecb06d1baf -s ours\n\nam skip reason: Merged-In Ie5d18887184068f7022676e484ed5f7363422a83 with SHA-1 f7b329f602 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3258358\n\nChange-Id: I0fe45cc40df3e28b409b1f15a59c90488ee38dd4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e1b8e9349adc763c6921ed7ffe08fa8ce7d923dc", "tree": "af01c99bb1eebbc8e85a5444108467504260d1ca", "parents": [ "ecb06d1baf466d5330bc31cea5e68ebe49007b93", "a6d9a74768e77e80dc37bf4e61150dc69cc7539a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 03:15:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 03:15:38 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge 24Q3 to AOSP main\" into main am: a6d9a74768 -s ours\n\nam skip reason: Merged-In Ie5d18887184068f7022676e484ed5f7363422a83 with SHA-1 f7b329f602 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3258358\n\nChange-Id: I3e650f36a0f914a5878440200908320f40108c29\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ecb06d1baf466d5330bc31cea5e68ebe49007b93", "tree": "af01c99bb1eebbc8e85a5444108467504260d1ca", "parents": [ "b04ad69cee1fab644ee4afd77ed4467a6442d212", "68bd02ba29f2b727995a25feb6bc4db974498cc6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 03:15:35 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 03:15:35 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 68bd02ba29 -s ours\n\nam skip reason: Merged-In Ie5d18887184068f7022676e484ed5f7363422a83 with SHA-1 f7b329f602 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3258358\n\nChange-Id: Ie463f4ba1401ba6a742a932281fb0d121a547ca3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6d9a74768e77e80dc37bf4e61150dc69cc7539a", "tree": "af01c99bb1eebbc8e85a5444108467504260d1ca", "parents": [ "a7db27231198d678fcef5706c98c0ad83f044ccf", "68bd02ba29f2b727995a25feb6bc4db974498cc6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 01:12:31 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Sep 07 01:12:31 2024 +0000" }, "message": "Merge \"Merge 24Q3 to AOSP main\" into main" }, { "commit": "95b79ab168428a7e7551cdcb052d7f758ffd7bda", "tree": "9b6e25605eef5875443525b6a0b74119bb43a212", "parents": [ "deda49be69e74b3428e1c9b64c182251218fbadf", "b04ad69cee1fab644ee4afd77ed4467a6442d212" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Sep 06 18:53:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 06 18:53:02 2024 +0000" }, "message": "Merge \"Make java_sdk_library dependencies explicit\" into main am: a7db272311 am: b04ad69cee\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3256786\n\nChange-Id: I27ce2605204fc4e5dbd70c49e80d018d1d528697\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b04ad69cee1fab644ee4afd77ed4467a6442d212", "tree": "af01c99bb1eebbc8e85a5444108467504260d1ca", "parents": [ "b41f6b9e15e554bf2f1fa69bf8ce612d01cce4f0", "a7db27231198d678fcef5706c98c0ad83f044ccf" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Sep 06 18:42:43 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 06 18:42:43 2024 +0000" }, "message": "Merge \"Make java_sdk_library dependencies explicit\" into main am: a7db272311\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/3256786\n\nChange-Id: I66ab13aab9b8bdd94ec1c29a53a783ca41f462fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a7db27231198d678fcef5706c98c0ad83f044ccf", "tree": "127583ee417aeee1d14ef475ad4c3945aae536bc", "parents": [ "4432331b54ba88c3ad8eaed4c5d6849db8ffdff2", "b7712cf0d031e95ece82b1424fa8a6d0effb6c3f" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Sep 06 18:29:36 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 06 18:29:36 2024 +0000" }, "message": "Merge \"Make java_sdk_library dependencies explicit\" into main" }, { "commit": "b7712cf0d031e95ece82b1424fa8a6d0effb6c3f", "tree": "127583ee417aeee1d14ef475ad4c3945aae536bc", "parents": [ "4432331b54ba88c3ad8eaed4c5d6849db8ffdff2" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Sep 06 05:20:59 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Sep 06 05:20:59 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit\n\nmodules should specify the submodule of java_sdk_library that the module\nactually depends on\n\nTest: CI\nBug: 358613520\nChange-Id: I92ab17110234da1734476fbbd3a910097d6439a7\n" }, { "commit": "68bd02ba29f2b727995a25feb6bc4db974498cc6", "tree": "59ca90191278dd707aef47ef0bef806892d1f43c", "parents": [ "4432331b54ba88c3ad8eaed4c5d6849db8ffdff2", "b41f6b9e15e554bf2f1fa69bf8ce612d01cce4f0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:01 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:01 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: Ie5d18887184068f7022676e484ed5f7363422a83\nChange-Id: I018b4f9fc3d006bfa7de508e2c99eefdaa648a6d\n" }, { "commit": "deda49be69e74b3428e1c9b64c182251218fbadf", "tree": "3b559591bf85f0d069868736de0617b7f6448835", "parents": [ "846faf87577bb1729302c139b2a405a44a85ff66" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Sep 05 06:20:58 2024 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Sep 05 06:20:58 2024 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ie480e31e744f8442c283cc8437043da1d2835cba\n" }, { "commit": "846faf87577bb1729302c139b2a405a44a85ff66", "tree": "0fafe4523292de3395f240dd736c7d037a9f6bb1", "parents": [ "a96267a5b3e897321be2dbdbbf53af0514b6460f", "995755625e80c0d0399e807e6f57599af477e057" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Wed Sep 04 23:29:40 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 04 23:29:40 2024 +0000" }, "message": "Merge \"Cleaned up the flag support_phone_uid_check_for_multiuser\" into main" }, { "commit": "a96267a5b3e897321be2dbdbbf53af0514b6460f", "tree": "54129a2de431ac47f5a44c2ab20aeb2cb0906505", "parents": [ "fb269d0849170120a68ade96308995fe0fa2cbb9", "9f96448b4365c4677fd66a79e8271a3862f9be1e" ], "author": { "name": "Jahdiel Alvarez", "email": "jahdiel@google.com", "time": "Tue Sep 03 20:09:46 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 03 20:09:46 2024 +0000" }, "message": "Merge \"Fix ContactsProviderTests for HSUM devices\" into main" } ], "next": "995755625e80c0d0399e807e6f57599af477e057" }