Merge "Only allow mediaserver to report video battery stats" into qt-qpr1-dev (ec9962c1) · Commits · e / os / android_frameworks_base

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

+4 −11

Original line number	Diff line number	Diff line
		@@ -756,7 +756,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		}

		public void noteStartAudio(int uid) {
		enforceSelfOrCallingPermission(uid);
		enforceCallingPermission();
		synchronized (mStats) {
		mStats.noteAudioOnLocked(uid);
		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) {
		enforceSelfOrCallingPermission(uid);
		enforceCallingPermission();
		synchronized (mStats) {
		mStats.noteAudioOffLocked(uid);
		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) {
		enforceSelfOrCallingPermission(uid);
		enforceCallingPermission();
		synchronized (mStats) {
		mStats.noteVideoOnLocked(uid);
		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) {
		enforceSelfOrCallingPermission(uid);
		enforceCallingPermission();
		synchronized (mStats) {
		mStats.noteVideoOffLocked(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);
		}

		private void enforceSelfOrCallingPermission(int uid) {
		if (Binder.getCallingUid() == uid) {
		return;
		}
		enforceCallingPermission();
		}

		final class WakeupReasonThread extends Thread {
		private static final int MAX_REASON_SIZE = 512;
		private CharsetDecoder mDecoder;