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

Commit 28245922 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 am: e31d093e

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

Change-Id: If21ff372bb8dd03093e6826a31c98b67e61262a0
parents fcbb0e23 e31d093e

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) {