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

Commit df9df4d6 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: c752c7cb

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

Change-Id: Ic556a0499f014fbd795f234771d138d538b8560e
parents 16cf650b c752c7cb

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

+0 −2
Original line number Diff line number Diff line
@@ -2499,7 +2499,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) {
@@ -2512,7 +2511,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) {