Merge "Fix concurrency issue with BatteryUsageStats"

import android.os.BatteryStats;

import android.os.BatteryUsageStats;

import android.os.BatteryUsageStatsQuery;

import android.os.Parcel;

import android.os.SystemClock;

import android.os.UidBatteryConsumer;

import android.util.Log;

            }

            BatteryStatsImpl batteryStatsImpl = (BatteryStatsImpl) mStats;

            // Make a copy of battery history to avoid concurrent modification.

            Parcel historyBuffer = Parcel.obtain();

            historyBuffer.appendFrom(batteryStatsImpl.mHistoryBuffer, 0,

                    batteryStatsImpl.mHistoryBuffer.dataSize());

            ArrayList<BatteryStats.HistoryTag> tags = new ArrayList<>(

                    batteryStatsImpl.mHistoryTagPool.size());

            for (Map.Entry<BatteryStats.HistoryTag, Integer> entry :

                    batteryStatsImpl.mHistoryTagPool.entrySet()) {

                final BatteryStats.HistoryTag tag = entry.getKey();

                final BatteryStats.HistoryTag tag = new BatteryStats.HistoryTag();

                tag.setTo(entry.getKey());

                tag.poolIdx = entry.getValue();

                tags.add(tag);

            }

            batteryUsageStatsBuilder.setBatteryHistory(batteryStatsImpl.mHistoryBuffer, tags);

            batteryUsageStatsBuilder.setBatteryHistory(historyBuffer, tags);

        }

        return batteryUsageStatsBuilder.build();