)]}'
{
  "commit": "d7b70b883d3a1a6f83bd6f24e49cd9da0d74a4ed",
  "tree": "0f713829c0b28533da88dc963bbbf2a71afbfbe3",
  "parents": [
    "02a31a6ec2a0c9759ac7993eda98999ee79f325b"
  ],
  "author": {
    "name": "Kangping Dong",
    "email": "wgtdkp@google.com",
    "time": "Mon Feb 19 22:09:13 2024 +0800"
  },
  "committer": {
    "name": "Kangping Dong",
    "email": "wgtdkp@google.com",
    "time": "Tue Feb 20 23:18:06 2024 +0800"
  },
  "message": "[Thread] rename package name for Thread platform flags\n\n(This is a cherry-pick of aosp/2968526 for resolving merge conflicts)\n\nThere are two Thread flag files in frameworks/base and\npackages/modules/Connectivity/thread. Both are currently using the same\n\"com.android.net.thread.flags\" package name for their flags. While all\nflags needs to be built in a aconfig_declarations target, two aconfig_declarations\ncan\u0027t have the same package name:\n\n```\nFAILED: out/soong/build.aosp_arm.ninja\ncd \"$(dirname \"out/host/linux-x86/bin/soong_build\")\" \u0026\u0026 BUILDER\u003d\"$PWD/$(basename \"out/host/linux-x86/bin/soong_build\")\" \u0026\u0026 cd / \u0026\u0026 env -i  \"$BUILDER\"     --top \"$TOP\"     --soong_out \"out/soong\"     --out \"out\"     --soong_variables out/soong/soong.aosp_arm.variables -o out/soong/b\nuild.aosp_arm.ninja --globListDir aosp_arm --globFile out/soong/globs-aosp_arm.ninja -l out/.module_paths/Android.bp.list --available_env out/soong/soong.environment.available --used_env out/soong/soong.environment.used.aosp_arm.build Android.bp\n2 aconfig_declarations found for package com.android.net.thread.flags\n```\n\nTo resolve this issue, this commit renames the platform flags to package\nname \"android.net.thread.platform.flags\".\n\nThis commit is required by ag/26286387\n\nBug: 325886480\nChange-Id: Icacf88f7c0aa499b4b29f4072ae58840f0b1761f\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "b782ad1241a54539471abc701ba5140ddcc3f5f0",
      "old_mode": 33188,
      "old_path": "AconfigFlags.bp",
      "new_id": "14658e5d9e4fe513aada546e89e9d13c34c99c54",
      "new_mode": 33188,
      "new_path": "AconfigFlags.bp"
    },
    {
      "type": "modify",
      "old_id": "e6e7fa883d54850212adca41c33f5d03ccde5dcd",
      "old_mode": 33188,
      "old_path": "core/java/android/content/Context.java",
      "new_id": "13c3ededbcd7421bc67324cf8cdaa54ec1e2fe8f",
      "new_mode": 33188,
      "new_path": "core/java/android/content/Context.java"
    },
    {
      "type": "modify",
      "old_id": "2a974ed6045d3b40dac910aecb79ff7d7e8b5549",
      "old_mode": 33188,
      "old_path": "core/java/android/content/pm/PackageManager.java",
      "new_id": "7a015cd187cabefed5045011f8efd261f0264b47",
      "new_mode": 33188,
      "new_path": "core/java/android/content/pm/PackageManager.java"
    },
    {
      "type": "modify",
      "old_id": "ff762d78c4124ded36857873bf6f633d8dd51106",
      "old_mode": 33188,
      "old_path": "core/java/android/net/thread/flags.aconfig",
      "new_id": "d679f9c3acb859e1e2af51f569029228fb737925",
      "new_mode": 33188,
      "new_path": "core/java/android/net/thread/flags.aconfig"
    },
    {
      "type": "modify",
      "old_id": "7873a76b519d4041f777c9c7f102ca0f2914b630",
      "old_mode": 33188,
      "old_path": "core/java/android/os/UserManager.java",
      "new_id": "be17d7c0f0db67c753ded793073d81bfd7154cb8",
      "new_mode": 33188,
      "new_path": "core/java/android/os/UserManager.java"
    },
    {
      "type": "modify",
      "old_id": "d5d26beae5966cf963ab83ebdb97364aed9f96b8",
      "old_mode": 33188,
      "old_path": "services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java",
      "new_id": "9c48f29912673525cd06d81225c53fc924612882",
      "new_mode": 33188,
      "new_path": "services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java"
    }
  ]
}