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

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

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

Change-Id: Ic72520995fcc6f5f2b08b22302d70a8a84c2732b
This commit is contained in:
TreeHugger Robot
2021-06-15 01:03:56 +00:00
committed by Automerger Merge Worker
parent cd9c2266b3 7c36b86be4
commit e31d093ed2
1 changed files with 2 additions and 0 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,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) {