Merge "Use FrameworkStatsLog in com.android.server.am.*" (841520a1) · Commits · e / os / android_frameworks_base

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

+18 −19

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

+28 −28

Original line number	Original line	Diff line number	Diff line
	@@ -293,7 +293,6 @@ import android.util.PrintWriterPrinter;
	import android.util.Slog;		import android.util.Slog;
	import android.util.SparseArray;		import android.util.SparseArray;
	import android.util.SparseIntArray;		import android.util.SparseIntArray;
	import android.util.StatsLog;
	import android.util.TimeUtils;		import android.util.TimeUtils;
	import android.util.proto.ProtoOutputStream;		import android.util.proto.ProtoOutputStream;
	import android.util.proto.ProtoUtils;		import android.util.proto.ProtoUtils;
	@@ -326,6 +325,7 @@ import com.android.internal.os.Zygote;
	import com.android.internal.util.ArrayUtils;		import com.android.internal.util.ArrayUtils;
	import com.android.internal.util.DumpUtils;		import com.android.internal.util.DumpUtils;
	import com.android.internal.util.FastPrintWriter;		import com.android.internal.util.FastPrintWriter;
			import com.android.internal.util.FrameworkStatsLog;
	import com.android.internal.util.MemInfoReader;		import com.android.internal.util.MemInfoReader;
	import com.android.internal.util.Preconditions;		import com.android.internal.util.Preconditions;
	import com.android.internal.util.function.HexFunction;		import com.android.internal.util.function.HexFunction;
	@@ -3070,10 +3070,10 @@ public class ActivityManagerService extends IActivityManager.Stub
	"updateBatteryStats: comp=" + activity + "res=" + resumed);		"updateBatteryStats: comp=" + activity + "res=" + resumed);
	}		}
	final BatteryStatsImpl stats = mBatteryStatsService.getActiveStatistics();		final BatteryStatsImpl stats = mBatteryStatsService.getActiveStatistics();
	StatsLog.write(StatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED,		FrameworkStatsLog.write(FrameworkStatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED,
	uid, activity.getPackageName(), activity.getShortClassName(),		uid, activity.getPackageName(), activity.getShortClassName(),
	resumed ? StatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__FOREGROUND :		resumed ? FrameworkStatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__FOREGROUND :
	StatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__BACKGROUND);		FrameworkStatsLog.ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__BACKGROUND);
	synchronized (stats) {		synchronized (stats) {
	if (resumed) {		if (resumed) {
	stats.noteActivityResumedLocked(uid);		stats.noteActivityResumedLocked(uid);
	@@ -3797,7 +3797,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	// On the device which doesn't have Cgroup, log LmkStateChanged which is used as a signal		// On the device which doesn't have Cgroup, log LmkStateChanged which is used as a signal
	// for pulling memory stats of other running processes when this process died.		// for pulling memory stats of other running processes when this process died.
	if (!hasMemcg()) {		if (!hasMemcg()) {
	StatsLog.write(StatsLog.APP_DIED, SystemClock.elapsedRealtime());		FrameworkStatsLog.write(FrameworkStatsLog.APP_DIED, SystemClock.elapsedRealtime());
	}		}
	}		}

	@@ -4443,7 +4443,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	proc.pkgList.mPkgList);		proc.pkgList.mPkgList);
	for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) {		for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) {
	ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);		ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);
	StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
	proc.info.uid,		proc.info.uid,
	holder.state.getName(),		holder.state.getName(),
	holder.state.getPackage(),		holder.state.getPackage(),
	@@ -4501,7 +4501,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	ProcessStats.ADD_PSS_EXTERNAL, endTime-startTime, proc.pkgList.mPkgList);		ProcessStats.ADD_PSS_EXTERNAL, endTime-startTime, proc.pkgList.mPkgList);
	for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) {		for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) {
	ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);		ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);
	StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
	proc.info.uid,		proc.info.uid,
	holder.state.getName(),		holder.state.getName(),
	holder.state.getPackage(),		holder.state.getPackage(),
	@@ -5224,12 +5224,12 @@ public class ActivityManagerService extends IActivityManager.Stub
	checkTime(startTime, "attachApplicationLocked: after updateOomAdjLocked");		checkTime(startTime, "attachApplicationLocked: after updateOomAdjLocked");
	}		}

	StatsLog.write(		FrameworkStatsLog.write(
	StatsLog.PROCESS_START_TIME,		FrameworkStatsLog.PROCESS_START_TIME,
	app.info.uid,		app.info.uid,
	app.pid,		app.pid,
	app.info.packageName,		app.info.packageName,
	StatsLog.PROCESS_START_TIME__TYPE__COLD,		FrameworkStatsLog.PROCESS_START_TIME__TYPE__COLD,
	app.startTime,		app.startTime,
	(int) (bindApplicationTimeMillis - app.startTime),		(int) (bindApplicationTimeMillis - app.startTime),
	(int) (SystemClock.elapsedRealtime() - app.startTime),		(int) (SystemClock.elapsedRealtime() - app.startTime),
	@@ -8859,8 +8859,8 @@ public class ActivityManagerService extends IActivityManager.Stub
	UserHandle.getUserId(workSourceUid), SystemClock.elapsedRealtime());		UserHandle.getUserId(workSourceUid), SystemClock.elapsedRealtime());
	}		}

	StatsLog.write(StatsLog.WAKEUP_ALARM_OCCURRED, workSource, tag, sourcePkg,		FrameworkStatsLog.write(FrameworkStatsLog.WAKEUP_ALARM_OCCURRED, workSource, tag,
	standbyBucket);		sourcePkg, standbyBucket);
	if (DEBUG_POWER) {		if (DEBUG_POWER) {
	Slog.w(TAG, "noteWakeupAlarm[ sourcePkg=" + sourcePkg + ", sourceUid=" + sourceUid		Slog.w(TAG, "noteWakeupAlarm[ sourcePkg=" + sourcePkg + ", sourceUid=" + sourceUid
	+ ", workSource=" + workSource + ", tag=" + tag + ", standbyBucket="		+ ", workSource=" + workSource + ", tag=" + tag + ", standbyBucket="
	@@ -8871,8 +8871,8 @@ public class ActivityManagerService extends IActivityManager.Stub
	standbyBucket = mUsageStatsService.getAppStandbyBucket(sourcePkg,		standbyBucket = mUsageStatsService.getAppStandbyBucket(sourcePkg,
	UserHandle.getUserId(sourceUid), SystemClock.elapsedRealtime());		UserHandle.getUserId(sourceUid), SystemClock.elapsedRealtime());
	}		}
	StatsLog.write_non_chained(StatsLog.WAKEUP_ALARM_OCCURRED, sourceUid, null, tag,		FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKEUP_ALARM_OCCURRED, sourceUid,
	sourcePkg, standbyBucket);		null, tag, sourcePkg, standbyBucket);
	if (DEBUG_POWER) {		if (DEBUG_POWER) {
	Slog.w(TAG, "noteWakeupAlarm[ sourcePkg=" + sourcePkg + ", sourceUid=" + sourceUid		Slog.w(TAG, "noteWakeupAlarm[ sourcePkg=" + sourcePkg + ", sourceUid=" + sourceUid
	+ ", workSource=" + workSource + ", tag=" + tag + ", standbyBucket="		+ ", workSource=" + workSource + ", tag=" + tag + ", standbyBucket="
	@@ -9606,20 +9606,20 @@ public class ActivityManagerService extends IActivityManager.Stub
	crashInfo.throwFileName,		crashInfo.throwFileName,
	crashInfo.throwLineNumber);		crashInfo.throwLineNumber);

	StatsLog.write(StatsLog.APP_CRASH_OCCURRED,		FrameworkStatsLog.write(FrameworkStatsLog.APP_CRASH_OCCURRED,
	Binder.getCallingUid(),		Binder.getCallingUid(),
	eventType,		eventType,
	processName,		processName,
	Binder.getCallingPid(),		Binder.getCallingPid(),
	(r != null && r.info != null) ? r.info.packageName : "",		(r != null && r.info != null) ? r.info.packageName : "",
	(r != null && r.info != null) ? (r.info.isInstantApp()		(r != null && r.info != null) ? (r.info.isInstantApp()
	? StatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__TRUE		? FrameworkStatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__TRUE
	: StatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__FALSE)		: FrameworkStatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__FALSE)
	: StatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__UNAVAILABLE,		: FrameworkStatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__UNAVAILABLE,
	r != null ? (r.isInterestingToUserLocked()		r != null ? (r.isInterestingToUserLocked()
	? StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__FOREGROUND		? FrameworkStatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__FOREGROUND
	: StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__BACKGROUND)		: FrameworkStatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__BACKGROUND)
	: StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__UNKNOWN,		: FrameworkStatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__UNKNOWN,
	processName.equals("system_server") ? ServerProtoEnums.SYSTEM_SERVER		processName.equals("system_server") ? ServerProtoEnums.SYSTEM_SERVER
	: (r != null) ? r.getProcessClassEnum()		: (r != null) ? r.getProcessClassEnum()
	: ServerProtoEnums.ERROR_SOURCE_UNKNOWN		: ServerProtoEnums.ERROR_SOURCE_UNKNOWN
	@@ -9810,7 +9810,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	EventLogTags.writeAmWtf(UserHandle.getUserId(callingUid), callingPid,		EventLogTags.writeAmWtf(UserHandle.getUserId(callingUid), callingPid,
	processName, r == null ? -1 : r.info.flags, tag, crashInfo.exceptionMessage);		processName, r == null ? -1 : r.info.flags, tag, crashInfo.exceptionMessage);

	StatsLog.write(StatsLog.WTF_OCCURRED, callingUid, tag, processName,		FrameworkStatsLog.write(FrameworkStatsLog.WTF_OCCURRED, callingUid, tag, processName,
	callingPid, (r != null) ? r.getProcessClassEnum() : 0);		callingPid, (r != null) ? r.getProcessClassEnum() : 0);

	addErrorToDropBox("wtf", r, processName, null, null, null, tag, null, null, crashInfo);		addErrorToDropBox("wtf", r, processName, null, null, null, tag, null, null, crashInfo);
	@@ -13049,7 +13049,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	reportType, endTime-startTime, r.pkgList.mPkgList);		reportType, endTime-startTime, r.pkgList.mPkgList);
	for (int ipkg = r.pkgList.size() - 1; ipkg >= 0; ipkg--) {		for (int ipkg = r.pkgList.size() - 1; ipkg >= 0; ipkg--) {
	ProcessStats.ProcessStateHolder holder = r.pkgList.valueAt(ipkg);		ProcessStats.ProcessStateHolder holder = r.pkgList.valueAt(ipkg);
	StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
	r.info.uid,		r.info.uid,
	holder.state.getName(),		holder.state.getName(),
	holder.state.getPackage(),		holder.state.getPackage(),
	@@ -13653,7 +13653,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	reportType, endTime-startTime, r.pkgList.mPkgList);		reportType, endTime-startTime, r.pkgList.mPkgList);
	for (int ipkg = r.pkgList.size() - 1; ipkg >= 0; ipkg--) {		for (int ipkg = r.pkgList.size() - 1; ipkg >= 0; ipkg--) {
	ProcessStats.ProcessStateHolder holder = r.pkgList.valueAt(ipkg);		ProcessStats.ProcessStateHolder holder = r.pkgList.valueAt(ipkg);
	StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
	r.info.uid,		r.info.uid,
	holder.state.getName(),		holder.state.getName(),
	holder.state.getPackage(),		holder.state.getPackage(),
	@@ -14220,7 +14220,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	catPw.flush();		catPw.flush();
	}		}
	dropBuilder.append(catSw.toString());		dropBuilder.append(catSw.toString());
	StatsLog.write(StatsLog.LOW_MEM_REPORTED);		FrameworkStatsLog.write(FrameworkStatsLog.LOW_MEM_REPORTED);
	addErrorToDropBox("lowmem", null, "system_server", null,		addErrorToDropBox("lowmem", null, "system_server", null,
	null, null, tag.toString(), dropBuilder.toString(), null, null);		null, null, tag.toString(), dropBuilder.toString(), null, null);
	//Slog.i(TAG, "Sent to dropbox:");		//Slog.i(TAG, "Sent to dropbox:");
	@@ -16860,7 +16860,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	pss, uss, rss, true, statType, pssDuration, proc.pkgList.mPkgList);		pss, uss, rss, true, statType, pssDuration, proc.pkgList.mPkgList);
	for (int ipkg = proc.pkgList.mPkgList.size() - 1; ipkg >= 0; ipkg--) {		for (int ipkg = proc.pkgList.mPkgList.size() - 1; ipkg >= 0; ipkg--) {
	ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);		ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);
	StatsLog.write(StatsLog.PROCESS_MEMORY_STAT_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
	proc.info.uid,		proc.info.uid,
	holder.state.getName(),		holder.state.getName(),
	holder.state.getPackage(),		holder.state.getPackage(),
	@@ -17220,7 +17220,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	app.baseProcessTracker.reportExcessiveCpu(app.pkgList.mPkgList);		app.baseProcessTracker.reportExcessiveCpu(app.pkgList.mPkgList);
	for (int ipkg = app.pkgList.size() - 1; ipkg >= 0; ipkg--) {		for (int ipkg = app.pkgList.size() - 1; ipkg >= 0; ipkg--) {
	ProcessStats.ProcessStateHolder holder = app.pkgList.valueAt(ipkg);		ProcessStats.ProcessStateHolder holder = app.pkgList.valueAt(ipkg);
	StatsLog.write(StatsLog.EXCESSIVE_CPU_USAGE_REPORTED,		FrameworkStatsLog.write(FrameworkStatsLog.EXCESSIVE_CPU_USAGE_REPORTED,
	app.info.uid,		app.info.uid,
	holder.state.getName(),		holder.state.getName(),
	holder.state.getPackage(),		holder.state.getPackage(),
	@@ -17507,7 +17507,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	}		}
	if (memFactor != mLastMemoryLevel) {		if (memFactor != mLastMemoryLevel) {
	EventLogTags.writeAmMemFactor(memFactor, mLastMemoryLevel);		EventLogTags.writeAmMemFactor(memFactor, mLastMemoryLevel);
	StatsLog.write(StatsLog.MEMORY_FACTOR_STATE_CHANGED, memFactor);		FrameworkStatsLog.write(FrameworkStatsLog.MEMORY_FACTOR_STATE_CHANGED, memFactor);
	}		}
	mLastMemoryLevel = memFactor;		mLastMemoryLevel = memFactor;
	mLastNumProcesses = mProcessList.getLruSizeLocked();		mLastNumProcesses = mProcessList.getLruSizeLocked();

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -33,11 +33,11 @@ import android.telephony.ModemActivityInfo;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	import android.util.IntArray;		import android.util.IntArray;
	import android.util.Slog;		import android.util.Slog;
	import android.util.StatsLog;
	import android.util.TimeUtils;		import android.util.TimeUtils;

	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;
	import com.android.internal.os.BatteryStatsImpl;		import com.android.internal.os.BatteryStatsImpl;
			import com.android.internal.util.FrameworkStatsLog;
	import com.android.internal.util.function.pooled.PooledLambda;		import com.android.internal.util.function.pooled.PooledLambda;

	import libcore.util.EmptyArray;		import libcore.util.EmptyArray;
	@@ -374,8 +374,8 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync {
	// Clean up any UIDs if necessary.		// Clean up any UIDs if necessary.
	synchronized (mStats) {		synchronized (mStats) {
	for (int uid : uidsToRemove) {		for (int uid : uidsToRemove) {
	StatsLog.write(StatsLog.ISOLATED_UID_CHANGED, -1, uid,		FrameworkStatsLog.write(FrameworkStatsLog.ISOLATED_UID_CHANGED, -1, uid,
	StatsLog.ISOLATED_UID_CHANGED__EVENT__REMOVED);		FrameworkStatsLog.ISOLATED_UID_CHANGED__EVENT__REMOVED);
	mStats.removeIsolatedUidLocked(uid);		mStats.removeIsolatedUidLocked(uid);
	}		}
	mStats.clearPendingRemovedUids();		mStats.clearPendingRemovedUids();

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

+61 −59

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -47,10 +47,11 @@ import android.permission.IPermissionManager;
	import android.util.EventLog;		import android.util.EventLog;
	import android.util.Slog;		import android.util.Slog;
	import android.util.SparseIntArray;		import android.util.SparseIntArray;
	import android.util.StatsLog;
	import android.util.TimeUtils;		import android.util.TimeUtils;
	import android.util.proto.ProtoOutputStream;		import android.util.proto.ProtoOutputStream;

			import com.android.internal.util.FrameworkStatsLog;

	import java.io.FileDescriptor;		import java.io.FileDescriptor;
	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.text.SimpleDateFormat;		import java.text.SimpleDateFormat;
	@@ -1255,8 +1256,8 @@ public final class BroadcastQueue {
	r.dispatchClockTime = System.currentTimeMillis();		r.dispatchClockTime = System.currentTimeMillis();

	if (mLogLatencyMetrics) {		if (mLogLatencyMetrics) {
	StatsLog.write(		FrameworkStatsLog.write(
	StatsLog.BROADCAST_DISPATCH_LATENCY_REPORTED,		FrameworkStatsLog.BROADCAST_DISPATCH_LATENCY_REPORTED,
	r.dispatchClockTime - r.enqueueClockTime);		r.dispatchClockTime - r.enqueueClockTime);
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -19,12 +19,8 @@ package com.android.server.am;
	import static android.content.pm.PackageManager.PERMISSION_GRANTED;		import static android.content.pm.PackageManager.PERMISSION_GRANTED;
	import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;		import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
	import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST;		import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST;
	import static android.os.Process.BLUETOOTH_UID;
	import static android.os.Process.NETWORK_STACK_UID;
	import static android.os.Process.NFC_UID;		import static android.os.Process.NFC_UID;
	import static android.os.Process.PHONE_UID;
	import static android.os.Process.ROOT_UID;		import static android.os.Process.ROOT_UID;
	import static android.os.Process.SE_UID;
	import static android.os.Process.SYSTEM_UID;		import static android.os.Process.SYSTEM_UID;

	import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKGROUND_CHECK;		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKGROUND_CHECK;
	@@ -89,7 +85,6 @@ import android.util.EventLog;
	import android.util.PrintWriterPrinter;		import android.util.PrintWriterPrinter;
	import android.util.Slog;		import android.util.Slog;
	import android.util.SparseArray;		import android.util.SparseArray;
	import android.util.StatsLog;
	import android.util.TimeUtils;		import android.util.TimeUtils;
	import android.util.proto.ProtoOutputStream;		import android.util.proto.ProtoOutputStream;
	import android.webkit.WebViewZygote;		import android.webkit.WebViewZygote;
	@@ -103,6 +98,7 @@ import com.android.internal.os.BatteryStatsImpl;
	import com.android.internal.os.TransferPipe;		import com.android.internal.os.TransferPipe;
	import com.android.internal.util.DumpUtils;		import com.android.internal.util.DumpUtils;
	import com.android.internal.util.FastPrintWriter;		import com.android.internal.util.FastPrintWriter;
			import com.android.internal.util.FrameworkStatsLog;
	import com.android.server.AppStateTracker;		import com.android.server.AppStateTracker;
	import com.android.server.LocalServices;		import com.android.server.LocalServices;
	import com.android.server.SystemService;		import com.android.server.SystemService;
	@@ -728,8 +724,9 @@ public final class ActiveServices {
	stracker.setStarted(true, mAm.mProcessStats.getMemFactorLocked(), r.lastActivity);		stracker.setStarted(true, mAm.mProcessStats.getMemFactorLocked(), r.lastActivity);
	}		}
	r.callStart = false;		r.callStart = false;
	StatsLog.write(StatsLog.SERVICE_STATE_CHANGED, r.appInfo.uid, r.name.getPackageName(),		FrameworkStatsLog.write(FrameworkStatsLog.SERVICE_STATE_CHANGED, r.appInfo.uid,
	r.name.getClassName(), StatsLog.SERVICE_STATE_CHANGED__STATE__START);		r.name.getPackageName(), r.name.getClassName(),
			FrameworkStatsLog.SERVICE_STATE_CHANGED__STATE__START);
	synchronized (r.stats.getBatteryStats()) {		synchronized (r.stats.getBatteryStats()) {
	r.stats.startRunningLocked();		r.stats.startRunningLocked();
	}		}
	@@ -768,9 +765,9 @@ public final class ActiveServices {