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

Commit ad590b20 authored by Sorin Basca's avatar Sorin Basca Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Enforce declared permissions on getCellularBatteryStats() and getWifiBatteryStats()"" into sc-dev am: b1a13a73 am: f03c0de8

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

Change-Id: I963dd0a85f7f181f643f5768c2f87b92896f8539
parents 80d04b27 f03c0de8

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

+0 −2
Original line number Diff line number Diff line
@@ -2524,7 +2524,6 @@ 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) {
@@ -2537,7 +2536,6 @@ 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) {