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

Merge "Only allow mediaserver to report video battery stats" into qt-qpr1-dev

Browse Source
This commit is contained in:
Chong Zhang
2019-08-20 23:22:35 +00:00
committed by Android (Google) Code Review
parent e36d8d8645 9690348249
commit 166eee1f33
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -756,7 +756,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
} }
public void noteStartAudio(int uid) { public void noteStartAudio(int uid) {
enforceSelfOrCallingPermission(uid); enforceCallingPermission();
synchronized (mStats) { synchronized (mStats) {
mStats.noteAudioOnLocked(uid); mStats.noteAudioOnLocked(uid);
StatsLog.write_non_chained(StatsLog.AUDIO_STATE_CHANGED, uid, null, StatsLog.write_non_chained(StatsLog.AUDIO_STATE_CHANGED, uid, null,
@@ -765,7 +765,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
} }
public void noteStopAudio(int uid) { public void noteStopAudio(int uid) {
enforceSelfOrCallingPermission(uid); enforceCallingPermission();
synchronized (mStats) { synchronized (mStats) {
mStats.noteAudioOffLocked(uid); mStats.noteAudioOffLocked(uid);
StatsLog.write_non_chained(StatsLog.AUDIO_STATE_CHANGED, uid, null, StatsLog.write_non_chained(StatsLog.AUDIO_STATE_CHANGED, uid, null,
@@ -774,7 +774,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
} }
public void noteStartVideo(int uid) { public void noteStartVideo(int uid) {
enforceSelfOrCallingPermission(uid); enforceCallingPermission();
synchronized (mStats) { synchronized (mStats) {
mStats.noteVideoOnLocked(uid); mStats.noteVideoOnLocked(uid);
StatsLog.write_non_chained(StatsLog.MEDIA_CODEC_STATE_CHANGED, uid, null, StatsLog.write_non_chained(StatsLog.MEDIA_CODEC_STATE_CHANGED, uid, null,
@@ -783,7 +783,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
} }
public void noteStopVideo(int uid) { public void noteStopVideo(int uid) {
enforceSelfOrCallingPermission(uid); enforceCallingPermission();
synchronized (mStats) { synchronized (mStats) {
mStats.noteVideoOffLocked(uid); mStats.noteVideoOffLocked(uid);
StatsLog.write_non_chained(StatsLog.MEDIA_CODEC_STATE_CHANGED, uid, StatsLog.write_non_chained(StatsLog.MEDIA_CODEC_STATE_CHANGED, uid,
@@ -1184,13 +1184,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
Binder.getCallingPid(), Binder.getCallingUid(), null); Binder.getCallingPid(), Binder.getCallingUid(), null);
} }
private void enforceSelfOrCallingPermission(int uid) {
if (Binder.getCallingUid() == uid) {
return;
}
enforceCallingPermission();
}
final class WakeupReasonThread extends Thread { final class WakeupReasonThread extends Thread {
private static final int MAX_REASON_SIZE = 512; private static final int MAX_REASON_SIZE = 512;
private CharsetDecoder mDecoder; private CharsetDecoder mDecoder;