Merge "Use FrameworkStatsLog instead of StatsLog" (14d3112c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/VibratorService.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -65,13 +65,13 @@ import android.provider.Settings.SettingNotFoundException;
		import android.util.DebugUtils;
		import android.util.Slog;
		import android.util.SparseArray;
		import android.util.StatsLog;
		import android.util.proto.ProtoOutputStream;
		import android.view.InputDevice;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.app.IBatteryStats;
		import com.android.internal.util.DumpUtils;
		import com.android.internal.util.FrameworkStatsLog;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -1370,8 +1370,8 @@ public class VibratorService extends IVibratorService.Stub
		private void noteVibratorOnLocked(int uid, long millis) {
		try {
		mBatteryStatsService.noteVibratorOn(uid, millis);
		StatsLog.write_non_chained(StatsLog.VIBRATOR_STATE_CHANGED, uid, null,
		StatsLog.VIBRATOR_STATE_CHANGED__STATE__ON, millis);
		FrameworkStatsLog.write_non_chained(FrameworkStatsLog.VIBRATOR_STATE_CHANGED, uid, null,
		FrameworkStatsLog.VIBRATOR_STATE_CHANGED__STATE__ON, millis);
		mCurVibUid = uid;
		mIsVibrating = true;
		} catch (RemoteException e) {
		@@ -1382,8 +1382,8 @@ public class VibratorService extends IVibratorService.Stub
		if (mCurVibUid >= 0) {
		try {
		mBatteryStatsService.noteVibratorOff(mCurVibUid);
		StatsLog.write_non_chained(StatsLog.VIBRATOR_STATE_CHANGED, mCurVibUid, null,
		StatsLog.VIBRATOR_STATE_CHANGED__STATE__OFF, 0);
		FrameworkStatsLog.write_non_chained(FrameworkStatsLog.VIBRATOR_STATE_CHANGED,
		mCurVibUid, null, FrameworkStatsLog.VIBRATOR_STATE_CHANGED__STATE__OFF, 0);
		} catch (RemoteException e) { }
		mCurVibUid = -1;
		}

services/core/java/com/android/server/power/AttentionDetector.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -38,9 +38,9 @@ import android.provider.DeviceConfig;
		import android.provider.Settings;
		import android.service.attention.AttentionService;
		import android.util.Slog;
		import android.util.StatsLog;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.FrameworkStatsLog;
		import com.android.server.LocalServices;
		import com.android.server.wm.WindowManagerInternal;

		@@ -285,7 +285,8 @@ public class AttentionDetector {
		private void resetConsecutiveExtensionCount() {
		final long previousCount = mConsecutiveTimeoutExtendedCount.getAndSet(0);
		if (previousCount > 0) {
		StatsLog.write(StatsLog.SCREEN_TIMEOUT_EXTENSION_REPORTED, previousCount);
		FrameworkStatsLog.write(FrameworkStatsLog.SCREEN_TIMEOUT_EXTENSION_REPORTED,
		previousCount);
		}
		}

services/core/java/com/android/server/power/Notifier.java

+20 −16

Original line number	Diff line number	Diff line
		@@ -49,13 +49,13 @@ import android.provider.Settings;
		import android.telephony.TelephonyManager;
		import android.util.EventLog;
		import android.util.Slog;
		import android.util.StatsLog;
		import android.view.WindowManagerPolicyConstants.OnReason;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.app.IBatteryStats;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.util.FrameworkStatsLog;
		import com.android.server.EventLogTags;
		import com.android.server.LocalServices;
		import com.android.server.inputmethod.InputMethodManagerInternal;
		@@ -199,8 +199,8 @@ public class Notifier {
		try {
		mBatteryStats.noteInteractive(true);
		} catch (RemoteException ex) { }
		StatsLog.write(StatsLog.INTERACTIVE_STATE_CHANGED,
		StatsLog.INTERACTIVE_STATE_CHANGED__STATE__ON);
		FrameworkStatsLog.write(FrameworkStatsLog.INTERACTIVE_STATE_CHANGED,
		FrameworkStatsLog.INTERACTIVE_STATE_CHANGED__STATE__ON);
		}

		/**
		@@ -247,13 +247,15 @@ public class Notifier {
		try {
		if (workSource != null) {
		mBatteryStats.noteLongPartialWakelockStartFromSource(tag, historyTag, workSource);
		StatsLog.write(StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, workSource,
		tag, historyTag, StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__ON);
		FrameworkStatsLog.write(FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED,
		workSource, tag, historyTag,
		FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__ON);
		} else {
		mBatteryStats.noteLongPartialWakelockStart(tag, historyTag, ownerUid);
		StatsLog.write_non_chained(StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED,
		ownerUid, null, tag, historyTag,
		StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__ON);
		FrameworkStatsLog.write_non_chained(
		FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, ownerUid, null, tag,
		historyTag,
		FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__ON);
		}
		} catch (RemoteException ex) {
		// Ignore
		@@ -270,13 +272,15 @@ public class Notifier {
		try {
		if (workSource != null) {
		mBatteryStats.noteLongPartialWakelockFinishFromSource(tag, historyTag, workSource);
		StatsLog.write(StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, workSource,
		tag, historyTag, StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__OFF);
		FrameworkStatsLog.write(FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED,
		workSource, tag, historyTag,
		FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__OFF);
		} else {
		mBatteryStats.noteLongPartialWakelockFinish(tag, historyTag, ownerUid);
		StatsLog.write_non_chained(StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED,
		ownerUid, null, tag, historyTag,
		StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__OFF);
		FrameworkStatsLog.write_non_chained(
		FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, ownerUid, null, tag,
		historyTag,
		FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__OFF);
		}
		} catch (RemoteException ex) {
		// Ignore
		@@ -415,9 +419,9 @@ public class Notifier {
		try {
		mBatteryStats.noteInteractive(interactive);
		} catch (RemoteException ex) { }
		StatsLog.write(StatsLog.INTERACTIVE_STATE_CHANGED,
		interactive ? StatsLog.INTERACTIVE_STATE_CHANGED__STATE__ON :
		StatsLog.INTERACTIVE_STATE_CHANGED__STATE__OFF);
		FrameworkStatsLog.write(FrameworkStatsLog.INTERACTIVE_STATE_CHANGED,
		interactive ? FrameworkStatsLog.INTERACTIVE_STATE_CHANGED__STATE__ON :
		FrameworkStatsLog.INTERACTIVE_STATE_CHANGED__STATE__OFF);

		// Handle early behaviors.
		mInteractive = interactive;