commit a289aea016a66fd8929e120e46268da8cf5a2f34
author Mikhail Naganov <mnaganov@google.com> Mon Sep 17 15:26:23 2018 -0700
committer Mikhail Naganov <mnaganov@google.com> Thu Sep 20 09:11:24 2018 -0700
tree 677b63bd14f4c341eb707d003db0acdab46ebb1c
parent 05fa8856abaa1e050c3c8e6ba97fc8878ed7600a

audiopolicy: Refactor XML deserializer for the APM config

 -- Move deserialization traits classes into the .cpp file;

 -- Use unique_ptr for managing libxml objects lifetime;

 -- Define node and attribute names inline. This makes them
    inlined in the code, but that's OK since they are typically
    only used once.

 -- Avoid using reference types for "out" parameters.

 -- Check the status of deserializing collections.

 -- Misc renamings and generalizations for clarity.

Test: Compare dumpsys media.audio_policy A/B, check audio
Change-Id: Ib188964dee94acbccd701a58d45d3df206487d81

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index dd2158b..600f968 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -3921,10 +3921,9 @@
 
     for (const char* fileName : fileNames) {
         for (int i = 0; i < kConfigLocationListSize; i++) {
-            PolicySerializer serializer;
             snprintf(audioPolicyXmlConfigFile, sizeof(audioPolicyXmlConfigFile),
                      "%s/%s", kConfigLocationList[i], fileName);
-            ret = serializer.deserialize(audioPolicyXmlConfigFile, config);
+            ret = deserializeAudioPolicyFile(audioPolicyXmlConfigFile, &config);
             if (ret == NO_ERROR) {
                 config.setSource(audioPolicyXmlConfigFile);
                 return ret;