Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7948474 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enforce declared permissions on getCellularBatteryStats() and... 

Merge "Enforce declared permissions on getCellularBatteryStats() and getWifiBatteryStats()" into sc-dev am: 7c36b86b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14926476

Change-Id: Iad080d4c36ace79c2887371940e12b3d834651dd
parents 041c5f33 7c36b86b

services/core/java/com/android/server/am/BatteryStatsService.java

+2 −0
Original line number Diff line number Diff line
@@ -2499,6 +2499,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
     * @hide

     */

    public CellularBatteryStats getCellularBatteryStats() {

        enforceCallingPermission();

        // Wait for the completion of pending works if there is any

        awaitCompletion();

        synchronized (mStats) {
@@ -2511,6 +2512,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
     * @hide

     */

    public WifiBatteryStats getWifiBatteryStats() {

        enforceCallingPermission();

        // Wait for the completion of pending works if there is any

        awaitCompletion();

        synchronized (mStats) {