commit 2f762f10ec89e807f1b404f2963812e923005d69
author Michael Wachenschwanz <mwachens@google.com> Thu Jan 20 15:03:36 2022 -0800
committer Michael Wachenschwanz <mwachens@google.com> Thu Jan 20 15:04:38 2022 -0800
tree 3b21ad0e49af8db9a745a0b2913584396319beb4
parent 68f254af15a280b3d5ab6c0f83b27f765eb36451

Add BatteryStats owners to PowerProfile ownership

Bug: 194419357
Test: n/a
Change-Id: I088fb2513c906a4aee46791049a6bdb80f525a0f
Ignore-AOSP-First: fix merge conflict with master

core/java/com/android/internal/os/OWNERS

diff --git a/core/java/com/android/internal/os/OWNERS b/core/java/com/android/internal/os/OWNERS
index 7766b77..fd1d86b 100644
--- a/core/java/com/android/internal/os/OWNERS
+++ b/core/java/com/android/internal/os/OWNERS
@@ -12,4 +12,5 @@
 per-file *PowerEstimator* = file:/BATTERY_STATS_OWNERS
 per-file *Kernel* = file:/BATTERY_STATS_OWNERS
 per-file *MultiState* = file:/BATTERY_STATS_OWNERS
+per-file *PowerProfile* = file:/BATTERY_STATS_OWNERS
 

core/res/OWNERS

diff --git a/core/res/OWNERS b/core/res/OWNERS
index b18a989..4bea4d5 100644
--- a/core/res/OWNERS
+++ b/core/res/OWNERS
@@ -34,3 +34,7 @@
 
 # Wear
 per-file res/*-watch/* = file:/platform/frameworks/opt/wear:/OWNERS
+
+# PowerProfile
+per-file res/xml/power_profile.xml = file:/BATTERY_STATS_OWNERS
+per-file res/xml/power_profile_test.xml = file:/BATTERY_STATS_OWNERS