)]}'
{
  "commit": "4e356fc6d321b2b11709d8922fe02dbe8781063e",
  "tree": "7b3bf8695611341948d488521e5784b34e00d311",
  "parents": [
    "db0cd695c187d94288a495133fa57470b0958582"
  ],
  "author": {
    "name": "Felipe Leme",
    "email": "felipeal@google.com",
    "time": "Thu Mar 28 17:40:24 2024 -0700"
  },
  "committer": {
    "name": "Cherrypicker Worker",
    "email": "android-build-cherrypicker-worker@google.com",
    "time": "Fri Apr 12 02:44:23 2024 +0000"
  },
  "message": "Replaced all (but debug_mode) system_properties flag usage by device_config:\n\nFirst ran:\n\n$ find . -type f \\( -name \"*.xml\" -o -name \"*.java\" \\) -exec sed -i.bak \u0027s/setprop debug.adservices.\\([global.*|fledge.*|mdd.*|disable.*|sdk.*|adid.*|appsetid.*|measurement.*]\\)/device_config put adservices \\1/g\u0027 \"{}\" + \u0026\u0026 rm -rf `find . -name *.bak|xargs`\n\nThen replaced calls to setSystemProperty() by setFlag().\n\nTest: echo \u0027In pre-submit we trust!\u0027\nTest: rgrep -r setSystemProperty |egrep -v \u0027(DEBUG_MODE|TestableSystemPropertiesTest|PhFlagsTestHelper|PhFlagsSystemPropertyOverrideTest|AbstractFlagsSetterRule)\u0027|| echo \u0027Saul GoodMan!\u0027\n\nBug: 328101177\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3f51c96d4597d67ccc60bbb528dc0a9b70aafb7)\nMerged-In: I2a22582b0f245f737cd6a0198f318811f1ee395c\nChange-Id: I2a22582b0f245f737cd6a0198f318811f1ee395c\n24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "182611f37e3e5ef948ccd40b25710001bede9857",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/AndroidTest.ExtServices.xml",
      "new_id": "0e66f229b0d3f49a83d459a47dff8fc80b2168d9",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/AndroidTest.ExtServices.xml"
    },
    {
      "type": "modify",
      "old_id": "beeba4e1a96e3bd62e7919a1b8fdf67c4dcd9b7b",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/AndroidTest.Root.xml",
      "new_id": "3ed21cf5f113d90ce701e0bab2346dabe86b4393",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/AndroidTest.Root.xml"
    },
    {
      "type": "modify",
      "old_id": "c36a5c663b51db5d3b34ec493a5c20b8b0b18e1f",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/AndroidTest.xml",
      "new_id": "55e5f470ee6e937d33fb4e39919e73cb05d06498",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/AndroidTest.xml"
    },
    {
      "type": "modify",
      "old_id": "04b3850fffbceb99efaad1356c0565134dc0b250",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/AndroidTestDebuggable.ExtServices.xml",
      "new_id": "ea445d8faba1b93b13c71777ce2652530fc39162",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/AndroidTestDebuggable.ExtServices.xml"
    },
    {
      "type": "modify",
      "old_id": "8fa297da7199715d6a782525246c74c5385875b3",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/AndroidTestDebuggable.xml",
      "new_id": "175f36c45c32b4698e5f4d54e051cc7ce2a19ec6",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/AndroidTestDebuggable.xml"
    },
    {
      "type": "modify",
      "old_id": "01aaf6dfd52824d07aa83a16a2ef128559e6c7e7",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/adid/src/com/android/adservices/tests/adid/CtsAdIdEndToEndTestCase.java",
      "new_id": "f2e7b3378ded28c0854534922f6530cd06cd8e3b",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/adid/src/com/android/adservices/tests/adid/CtsAdIdEndToEndTestCase.java"
    },
    {
      "type": "modify",
      "old_id": "62f821a886d74a43300dcf2d6d0258b8d456f60d",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/measurement/src/com/android/adservices/tests/cts/measurement/CtsMeasurementEndToEndTestCase.java",
      "new_id": "05502d3f16d1b7886f31d9836c2c349763ee9c02",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/measurement/src/com/android/adservices/tests/cts/measurement/CtsMeasurementEndToEndTestCase.java"
    },
    {
      "type": "modify",
      "old_id": "874deae1daa595622d26f626407db69ace5bd81d",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/measurement/src/com/android/adservices/tests/cts/measurement/MeasurementManagerCtsTest.java",
      "new_id": "4945e8ea3c27f1f607b949476c759bf919a6c542",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/measurement/src/com/android/adservices/tests/cts/measurement/MeasurementManagerCtsTest.java"
    },
    {
      "type": "modify",
      "old_id": "cdd6d63272530f231ae6192a084db6014b21016f",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.ExtServices.xml",
      "new_id": "9a476f4660cb0bef74f58c1515f42241266577c3",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.ExtServices.xml"
    },
    {
      "type": "modify",
      "old_id": "26fc04a81f00b1b075adf06d6073ced592a5e6e2",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml",
      "new_id": "88244875313b9ebb2e033f614b39ae327d09a899",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml"
    },
    {
      "type": "modify",
      "old_id": "baf6b854d135c4523fecb76b8cffa1c26e9d0026",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.ExtServices.xml",
      "new_id": "967061a387cfa21b9df87bb66f243909e8e25865",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.ExtServices.xml"
    },
    {
      "type": "modify",
      "old_id": "74a2f6c0297e24e88241ce0f8e2e124d11eafa8f",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml",
      "new_id": "16f894dcdc1acb668628efe9a867f3a416d27b90",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml"
    },
    {
      "type": "modify",
      "old_id": "3ef9dbffc5b1a9a9cd3fd477b7d57a7960c7388e",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.ExtServices.xml",
      "new_id": "0dd072e67ab6ca4df8ef1a50190b309b8ee77d39",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.ExtServices.xml"
    },
    {
      "type": "modify",
      "old_id": "85f7cb78b6752a6b2d6912f498099876d2dd6d71",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml",
      "new_id": "07d1c47efc1dff563ee5b29b4eb68efed4e452cf",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml"
    },
    {
      "type": "modify",
      "old_id": "6a656bd2f5f57ecfdbc6a592ea77a65c24f0dc49",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/permissions/valid/AndroidTest.ExtServices.xml",
      "new_id": "577f38a96e6f7215b979146218c872f3c7160962",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/permissions/valid/AndroidTest.ExtServices.xml"
    },
    {
      "type": "modify",
      "old_id": "0f08c0d9ac82fb6e8017e3f539c6af146ef1bf86",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml",
      "new_id": "02328e1efafb81b9885faaf150b3f8abea10d511",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml"
    },
    {
      "type": "modify",
      "old_id": "2210b0795ddb8c54cb588563a8ae0ae3575f82f6",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/endtoends/topics/connection/src/com/android/adservices/tests/cts/topics/connection/TopicsConnectionTest.java",
      "new_id": "8cce2d5c182eee047c62f9b8263a40ae50670532",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/endtoends/topics/connection/src/com/android/adservices/tests/cts/topics/connection/TopicsConnectionTest.java"
    },
    {
      "type": "modify",
      "old_id": "f293d298b56e8a19875eef82dee40109125914d1",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/sandbox/adid/src/com/android/tests/sandbox/adid/SandboxedAdIdManagerTest.java",
      "new_id": "8ea15da88c954a39cf0c75199a17179a7a851634",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/sandbox/adid/src/com/android/tests/sandbox/adid/SandboxedAdIdManagerTest.java"
    },
    {
      "type": "modify",
      "old_id": "10a2a05e5fb6a96fcbb22a6b9132c72c43f16f38",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/sandbox/appsetid/src/com/android/tests/sandbox/appsetid/SandboxedAppSetIdManagerTest.java",
      "new_id": "12ea4270f4acdf3f8474a6cdd2ee2dd5aa23c009",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/sandbox/appsetid/src/com/android/tests/sandbox/appsetid/SandboxedAppSetIdManagerTest.java"
    },
    {
      "type": "modify",
      "old_id": "34022cbb6031a3321b51190a6f3c4bfea1adfab2",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/sandbox/fledge/AndroidTest.xml",
      "new_id": "36ee14cd87b771ffc8c8f321404469dce1107292",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/sandbox/fledge/AndroidTest.xml"
    },
    {
      "type": "modify",
      "old_id": "9562f5d3dea897f77391d2cd03f1d9bce4f6dcb7",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/sandbox/measurement/src/com/android/tests/sandbox/measurement/SandboxedMeasurementManagerTest.java",
      "new_id": "1db842832f24679c6e1928985615d36b0a31b166",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/sandbox/measurement/src/com/android/tests/sandbox/measurement/SandboxedMeasurementManagerTest.java"
    },
    {
      "type": "modify",
      "old_id": "cddfb73eb9ad6589a498d75bc07fdc6e0a39e572",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/src/android/adservices/debuggablects/MeasurementCtsDebuggableTest.java",
      "new_id": "68316b1e9d259ffe1078e086d135caf6f7d3f0f3",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/src/android/adservices/debuggablects/MeasurementCtsDebuggableTest.java"
    },
    {
      "type": "modify",
      "old_id": "221dda5251f92d353a30015830fcfc3e4e4fa2ca",
      "old_mode": 33188,
      "old_path": "adservices/tests/cts/src/android/adservices/utils/FledgeScenarioTest.java",
      "new_id": "d898b4859f41fc66ffc8bf575be3d71d3141b64b",
      "new_mode": 33188,
      "new_path": "adservices/tests/cts/src/android/adservices/utils/FledgeScenarioTest.java"
    },
    {
      "type": "modify",
      "old_id": "24239715d9410503d20105e87c091c521ad7e4b7",
      "old_mode": 33188,
      "old_path": "adservices/tests/endtoends/AndroidTest.ExtServices.xml",
      "new_id": "31df1f8575a324bf6b9a49e6300657e8d18d26d3",
      "new_mode": 33188,
      "new_path": "adservices/tests/endtoends/AndroidTest.ExtServices.xml"
    },
    {
      "type": "modify",
      "old_id": "e1c1e430f80c50108634e94e311e675446f190b8",
      "old_mode": 33188,
      "old_path": "adservices/tests/endtoends/AndroidTest.xml",
      "new_id": "38dff986733dd99f82be444da9817ce5d4b0a948",
      "new_mode": 33188,
      "new_path": "adservices/tests/endtoends/AndroidTest.xml"
    },
    {
      "type": "modify",
      "old_id": "240d7229502ccd8569368f41ff8401e845bfc4cd",
      "old_mode": 33188,
      "old_path": "adservices/tests/endtoends/src/com/android/adservices/measurement/MeasurementCompatibleManagerSandboxTest.java",
      "new_id": "b565f1934000daf6fb138d828de34c40d80327dd",
      "new_mode": 33188,
      "new_path": "adservices/tests/endtoends/src/com/android/adservices/measurement/MeasurementCompatibleManagerSandboxTest.java"
    },
    {
      "type": "modify",
      "old_id": "2a6938fc39bc4247083a4fc3391cea3c7dc63560",
      "old_mode": 33188,
      "old_path": "adservices/tests/jetpack/AndroidTest-1.0.0-beta05.xml",
      "new_id": "34b46ca62bfadbe8f8c50f09533fe25ff7802da2",
      "new_mode": 33188,
      "new_path": "adservices/tests/jetpack/AndroidTest-1.0.0-beta05.xml"
    },
    {
      "type": "modify",
      "old_id": "bb0734feed9f3aa37c09b5461479cb7e4494790f",
      "old_mode": 33188,
      "old_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta01.xml",
      "new_id": "88a927426f49289f67cdd6a974edca274f7938c5",
      "new_mode": 33188,
      "new_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta01.xml"
    },
    {
      "type": "modify",
      "old_id": "c122aade7972094dabf5ea65e5442afc02b2558d",
      "old_mode": 33188,
      "old_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta02.xml",
      "new_id": "a5ff9af8fcba5ad274df29e2b66c9526b0a2786c",
      "new_mode": 33188,
      "new_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta02.xml"
    },
    {
      "type": "modify",
      "old_id": "090b5c0c72b549438784d4939fbbddb536d849fe",
      "old_mode": 33188,
      "old_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta03-S.xml",
      "new_id": "52ad14ee374b90034b4551fdccfc87d71b1954f3",
      "new_mode": 33188,
      "new_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta03-S.xml"
    },
    {
      "type": "modify",
      "old_id": "193df33a919a54923c213a37f1145480a837ea24",
      "old_mode": 33188,
      "old_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta03.xml",
      "new_id": "ae82ee3c8ab0f1c19c9587b238c05cd521e034dd",
      "new_mode": 33188,
      "new_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta03.xml"
    },
    {
      "type": "modify",
      "old_id": "8f92fb13533a1fc251e62a2ebe3fc2f064850d9e",
      "old_mode": 33188,
      "old_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta04-S.xml",
      "new_id": "f8fd343c631d7637c08ac65486f4f8926b4f1e13",
      "new_mode": 33188,
      "new_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta04-S.xml"
    },
    {
      "type": "modify",
      "old_id": "670c18c48a34d9cc0508b3b56e3a6ea1f52d4fc3",
      "old_mode": 33188,
      "old_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta04.xml",
      "new_id": "09df24f211213d57493a387428baeb88acae3e0c",
      "new_mode": 33188,
      "new_path": "adservices/tests/jetpack/AndroidTest-1.1.0-beta04.xml"
    },
    {
      "type": "modify",
      "old_id": "b4abb04908c8efd8dc2820281323cd927d7e9713",
      "old_mode": 33188,
      "old_path": "adservices/tests/jetpack/src/com/android/adservices/TestUtil.java",
      "new_id": "5b1e2e8ec47bfb11a49c2a23870ddb7ac8857771",
      "new_mode": 33188,
      "new_path": "adservices/tests/jetpack/src/com/android/adservices/TestUtil.java"
    },
    {
      "type": "modify",
      "old_id": "17f690dc215a8e76e161a0079d94f63089d60af0",
      "old_mode": 33188,
      "old_path": "adservices/tests/perf/src/android/adservices/test/scenario/adservices/measurement/AbstractMeasurementLatencyTest.java",
      "new_id": "dc2ddfe9b8cde97b474ee5e54ddedc3579d2f6b0",
      "new_mode": 33188,
      "new_path": "adservices/tests/perf/src/android/adservices/test/scenario/adservices/measurement/AbstractMeasurementLatencyTest.java"
    },
    {
      "type": "modify",
      "old_id": "cda91779bb82d05df606086e865ec7f03bd1dade",
      "old_mode": 33188,
      "old_path": "adservices/tests/perf/src/android/adservices/test/scenario/adservices/measurement/load/profiles/MeasurementDefaultProfileSuite.java",
      "new_id": "e5da9358cb1adbcff9c2dca5461f6b948df3b917",
      "new_mode": 33188,
      "new_path": "adservices/tests/perf/src/android/adservices/test/scenario/adservices/measurement/load/profiles/MeasurementDefaultProfileSuite.java"
    },
    {
      "type": "modify",
      "old_id": "f64e9dc0b25f2fa83cb160569427981e4e5c2cff",
      "old_mode": 33188,
      "old_path": "adservices/tests/perf/src/android/adservices/test/scenario/adservices/utils/SelectAdsFlagRule.java",
      "new_id": "8caf4eca0d9c53fc7f5757e406832b5f22c4becd",
      "new_mode": 33188,
      "new_path": "adservices/tests/perf/src/android/adservices/test/scenario/adservices/utils/SelectAdsFlagRule.java"
    },
    {
      "type": "modify",
      "old_id": "215e3ed205830b401ab7d9291ffb9237cbdc352b",
      "old_mode": 33188,
      "old_path": "adservices/tests/test-util/java/com/android/adservices/common/AdServicesFlagsSetterRule.java",
      "new_id": "246c766f62e23de8aa0c306c9d8f4fb54a73fd92",
      "new_mode": 33188,
      "new_path": "adservices/tests/test-util/java/com/android/adservices/common/AdServicesFlagsSetterRule.java"
    }
  ]
}