Merge "Cleanup some SystemService.onUser...() comments" (c8eaa82d) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/BatteryStatsImpl.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -13862,10 +13862,6 @@ public class BatteryStatsImpl extends BatteryStats {
		return u;
		}

		public void onCleanupUserLocked(int userId) {
		onCleanupUserLocked(userId, mClocks.elapsedRealtime());
		}

		public void onCleanupUserLocked(int userId, long elapsedRealtimeMs) {
		final int firstUidForUser = UserHandle.getUid(userId, 0);
		final int lastUidForUser = UserHandle.getUid(userId, UserHandle.PER_USER_RANGE - 1);

+6 −6

Original line number	Diff line number	Diff line
		@@ -60,12 +60,12 @@ public final class SystemServiceManager implements Dumpable {
		// Constants used on onUser(...)
		// NOTE: do not change their values, as they're used on Trace calls and changes might break
		// performance tests that rely on them.
		private static final String USER_STARTING = "Start";
		private static final String USER_UNLOCKING = "Unlocking";
		private static final String USER_UNLOCKED = "Unlocked";
		private static final String USER_SWITCHING = "Switch";
		private static final String USER_STOPPING = "Stop";
		private static final String USER_STOPPED = "Cleanup";
		private static final String USER_STARTING = "Start"; // Logged as onStartUser
		private static final String USER_UNLOCKING = "Unlocking"; // Logged as onUnlockingUser
		private static final String USER_UNLOCKED = "Unlocked"; // Logged as onUnlockedUser
		private static final String USER_SWITCHING = "Switch"; // Logged as onSwitchUser
		private static final String USER_STOPPING = "Stop"; // Logged as onStopUser
		private static final String USER_STOPPED = "Cleanup"; // Logged as onCleanupUser

		private static File sSystemDir;
		private final Context mContext;

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ interface IWallpaperManagerService extends IWallpaperManager, IBinder {
		void onBootPhase(int phase);

		/**
		* @see com.android.server.SystemService#onUnlockUser(int)
		* @see com.android.server.SystemService#onUserUnlocking
		*/
		void onUnlockUser(final int userId);
		}
		No newline at end of file

+3 −3

Original line number	Diff line number	Diff line
		@@ -46,19 +46,19 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub {
		/**
		* To be called by {@link DevicePolicyManagerService#Lifecycle} when a new user starts.
		*
		* @see {@link SystemService#onStartUser}
		* @see {@link SystemService#onUserStarting}
		*/
		abstract void handleStartUser(int userId);
		/**
		* To be called by {@link DevicePolicyManagerService#Lifecycle} when a user is being unlocked.
		*
		* @see {@link SystemService#onUnlockUser}
		* @see {@link SystemService#onUserUnlocking}
		*/
		abstract void handleUnlockUser(int userId);
		/**
		* To be called by {@link DevicePolicyManagerService#Lifecycle} when a user is being stopped.
		*
		* @see {@link SystemService#onStopUser}
		* @see {@link SystemService#onUserStopping}
		*/
		abstract void handleStopUser(int userId);

+5 −5

Original line number	Diff line number	Diff line
		@@ -36,15 +36,15 @@ import java.lang.annotation.RetentionPolicy;
		*/
		public class SystemServiceUserEvent implements Parcelable {

		/** @see com.android.server.SystemService#onStartUser */
		/** @see com.android.server.SystemService#onUserStarting */
		public static final int TYPE_START_USER = 0;
		/** @see com.android.server.SystemService#onUnlockUser */
		/** @see com.android.server.SystemService#onUserUnlocking */
		public static final int TYPE_UNLOCK_USER = 1;
		/** @see com.android.server.SystemService#onSwitchUser*/
		/** @see com.android.server.SystemService#onUserSwitching*/
		public static final int TYPE_SWITCH_USER = 2;
		/** @see com.android.server.SystemService#onStopUser */
		/** @see com.android.server.SystemService#onUserStopping */
		public static final int TYPE_STOP_USER = 3;
		/** @see com.android.server.SystemService#onCleanupUser */
		/** @see com.android.server.SystemService#onUserStopped */
		public static final int TYPE_CLEANUP_USER = 4;
		private static final int TYPE_MAX = TYPE_CLEANUP_USER;