Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia818375396482169c861994c12fee9b299c191c5
This commit is contained in:
Sorin Basca
2021-06-15 14:52:11 +00:00
committed by Automerger Merge Worker
parent c5304aaf69 b1a13a7371
commit faacf61a4b
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -2499,7 +2499,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
* @hide * @hide
*/ */
public CellularBatteryStats getCellularBatteryStats() { public CellularBatteryStats getCellularBatteryStats() {
enforceCallingPermission();
// Wait for the completion of pending works if there is any // Wait for the completion of pending works if there is any
awaitCompletion(); awaitCompletion();
synchronized (mStats) { synchronized (mStats) {
@@ -2512,7 +2511,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
* @hide * @hide
*/ */
public WifiBatteryStats getWifiBatteryStats() { public WifiBatteryStats getWifiBatteryStats() {
enforceCallingPermission();
// Wait for the completion of pending works if there is any // Wait for the completion of pending works if there is any
awaitCompletion(); awaitCompletion();
synchronized (mStats) { synchronized (mStats) {