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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-14 23:39:00 +00:00
committed by Android (Google) Code Review
parent 8699bf3099 f4158fd258
commit 7c36b86be4
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 * @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) {
@@ -2511,6 +2512,7 @@ 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) {