)]}'
{
  "commit": "8916ae92a5e36c165d8d94c87bb67bb828234e72",
  "tree": "8ae09d24bbca1d47f1e4db3f6574314b91ac9b5f",
  "parents": [
    "353d2e39948802eac48f2fe4329d9afd3e59a395"
  ],
  "author": {
    "name": "Mikhail Naganov",
    "email": "mnaganov@google.com",
    "time": "Wed Oct 21 13:04:58 2020 -0700"
  },
  "committer": {
    "name": "Mikhail Naganov",
    "email": "mnaganov@google.com",
    "time": "Mon Mar 01 17:17:42 2021 -0800"
  },
  "message": "APM: Fix config de-serialization\n\nAudio Policy Manager and EngineConfig now try to load only one\nreadable APM config file. Previously they could try several\nuntil one of them parses successfully. This could result in\nloading of different files by APM and EC due to use of different\nparts of the config.\n\nCentralize finding of APM config file in audio_config.h.\nThis allows using the same logic in AudioPolicyManager.cpp\nand EngineConfig.cpp which previously got duplicated\nand later diverged.\n\nEnsure that failed attempts to de-serialize config do not leave\nAPM or EC in a \"dirty\" state.\n\nBug: 171339398\nTest: check audio on the device\nTest: atest audiopolicy_engineconfig_tests\nTest: atest audiopolicy_tests\nChange-Id: I98c21ab03d869eb5f4259ea12cd433632cf6da5d\nMerged-In: I98c21ab03d869eb5f4259ea12cd433632cf6da5d\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "395bc7006f0c14955bcde15720490f9d33473eea",
      "old_mode": 33188,
      "old_path": "services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h",
      "new_id": "cf1f64c50f7afef666787e9e011b3d828027742e",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h"
    },
    {
      "type": "modify",
      "old_id": "54704ea4d1fa47a847badae0c9e0480dad2dd2a2",
      "old_mode": 33188,
      "old_path": "services/audiopolicy/common/managerdefinitions/src/Serializer.cpp",
      "new_id": "129f6f67d6263d7e272dfac9122235c6c5a27a74",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/common/managerdefinitions/src/Serializer.cpp"
    },
    {
      "type": "modify",
      "old_id": "1875c108ba5215ff7fe136bfba18ed509b391c7a",
      "old_mode": 33188,
      "old_path": "services/audiopolicy/engine/common/src/EngineBase.cpp",
      "new_id": "8c7fb97c93e9e1dd26c97845eca016c1e60b72ea",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/engine/common/src/EngineBase.cpp"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "06ce111d943ae40d193ae985efb6453c13dce768",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/engine/config/TEST_MAPPING"
    },
    {
      "type": "modify",
      "old_id": "5d22c248e8b3e47b76fe274ae3ac9b5dc591ef41",
      "old_mode": 33188,
      "old_path": "services/audiopolicy/engine/config/include/EngineConfig.h",
      "new_id": "c56592659bfeda81b771f92b7a8e5f680d96778e",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/engine/config/include/EngineConfig.h"
    },
    {
      "type": "modify",
      "old_id": "daf6418a7ad92d8fb0a175ff63245c687f41edfb",
      "old_mode": 33188,
      "old_path": "services/audiopolicy/engine/config/src/EngineConfig.cpp",
      "new_id": "7cfef5bc7c4f91969233c7b55b87cd07e48899ad",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/engine/config/src/EngineConfig.cpp"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "6b0774fe821e23b3e64e3ba2fff3139c04113b77",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/engine/config/tests/Android.bp"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "f61e02f0328de7e97ad369efc109873adb45e927",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/engine/config/tests/engineconfig_tests.cpp"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "0aee0e98df08700f9400168d67a5937875311087",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/engine/config/tests/resources/Android.bp"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "16126b607135a4058e1d15a1b9f55bcbeed1218f",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/engine/config/tests/resources/test_apm_volume_tables.xml"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "3ec5d108b3194343bc3c8508c94d2d528e300ea7",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/engine/config/tests/resources/test_invalid_apm_volume_tables.xml"
    },
    {
      "type": "modify",
      "old_id": "4854d3a318e70bd5a64832a48f975aa7ff13321d",
      "old_mode": 33188,
      "old_path": "services/audiopolicy/managerdefault/AudioPolicyManager.cpp",
      "new_id": "c3ddcc3018a00cf58de7efc4a91a4e555612b492",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/managerdefault/AudioPolicyManager.cpp"
    },
    {
      "type": "modify",
      "old_id": "5b6b3e72a80e64b78e2c35ddaa7f6f3ca39530c3",
      "old_mode": 33188,
      "old_path": "services/audiopolicy/tests/audiopolicymanager_tests.cpp",
      "new_id": "a3d6db0028e0fb61818a4e61848a9238f9ecf9d3",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/tests/audiopolicymanager_tests.cpp"
    },
    {
      "type": "modify",
      "old_id": "9a23a88ecef4a6f7742030a7b0658c7c052edd74",
      "old_mode": 33188,
      "old_path": "services/audiopolicy/tests/resources/Android.bp",
      "new_id": "630bbcf023d103949b419edffa7353cc14d5847d",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/tests/resources/Android.bp"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "25641d519777b4ae0483c6c840846d6b216821a4",
      "new_mode": 33188,
      "new_path": "services/audiopolicy/tests/resources/test_invalid_audio_policy_configuration.xml"
    }
  ]
}
