Merge cherrypicks of [19734803] into tm-qpr1-release. (708cbb7f) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -956,7 +956,16 @@ public abstract class BatteryStats implements Parcelable {

		public static final int NUM_WIFI_BATCHED_SCAN_BINS = 5;

		public static final int NUM_USER_ACTIVITY_TYPES = PowerManager.USER_ACTIVITY_EVENT_MAX + 1;
		/**
		* Note that these must match the constants in android.os.PowerManager.
		* Also, if the user activity types change, the BatteryStatsImpl.VERSION must
		* also be bumped.
		*/
		static final String[] USER_ACTIVITY_TYPES = {
		"other", "button", "touch", "accessibility", "attention"
		};

		public static final int NUM_USER_ACTIVITY_TYPES = USER_ACTIVITY_TYPES.length;

		public abstract void noteUserActivityLocked(int type);
		public abstract boolean hasUserActivity();
		@@ -6168,7 +6177,7 @@ public abstract class BatteryStats implements Parcelable {
		}
		sb.append(val);
		sb.append(" ");
		sb.append(PowerManager.userActivityEventToString(i));
		sb.append(Uid.USER_ACTIVITY_TYPES[i]);
		}
		}
		if (hasData) {

core/java/android/os/PowerManager.java

+0 −38

Original line number	Diff line number	Diff line
		@@ -344,44 +344,6 @@ public final class PowerManager {
		*/
		public static final int USER_ACTIVITY_EVENT_DEVICE_STATE = 6;

		/**
		* @hide
		*/
		public static final int USER_ACTIVITY_EVENT_MAX = USER_ACTIVITY_EVENT_DEVICE_STATE;

		/**
		* @hide
		*/
		@IntDef(prefix = { "USER_ACTIVITY_EVENT_" }, value = {
		USER_ACTIVITY_EVENT_OTHER,
		USER_ACTIVITY_EVENT_BUTTON,
		USER_ACTIVITY_EVENT_TOUCH,
		USER_ACTIVITY_EVENT_ACCESSIBILITY,
		USER_ACTIVITY_EVENT_ATTENTION,
		USER_ACTIVITY_EVENT_FACE_DOWN,
		USER_ACTIVITY_EVENT_DEVICE_STATE,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface UserActivityEvent{}

		/**
		*
		* Convert the user activity event to a string for debugging purposes.
		* @hide
		*/
		public static String userActivityEventToString(@UserActivityEvent int userActivityEvent) {
		switch (userActivityEvent) {
		case USER_ACTIVITY_EVENT_OTHER: return "other";
		case USER_ACTIVITY_EVENT_BUTTON: return "button";
		case USER_ACTIVITY_EVENT_TOUCH: return "touch";
		case USER_ACTIVITY_EVENT_ACCESSIBILITY: return "accessibility";
		case USER_ACTIVITY_EVENT_ATTENTION: return "attention";
		case USER_ACTIVITY_EVENT_FACE_DOWN: return "faceDown";
		case USER_ACTIVITY_EVENT_DEVICE_STATE: return "deviceState";
		default: return Integer.toString(userActivityEvent);
		}
		}

		/**
		* User activity flag: If already dimmed, extend the dim timeout
		* but do not brighten. This flag is useful for keeping the screen on

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -6144,8 +6144,7 @@ public class BatteryStatsImpl extends BatteryStats {
		}

		@GuardedBy("this")
		public void noteUserActivityLocked(int uid, @PowerManager.UserActivityEvent int event,
		long elapsedRealtimeMs, long uptimeMs) {
		public void noteUserActivityLocked(int uid, int event, long elapsedRealtimeMs, long uptimeMs) {
		if (mOnBatteryInternal) {
		uid = mapUid(uid);
		getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs).noteUserActivityLocked(event);
		@@ -9957,14 +9956,14 @@ public class BatteryStatsImpl extends BatteryStats {
		}

		@Override
		public void noteUserActivityLocked(@PowerManager.UserActivityEvent int event) {
		public void noteUserActivityLocked(int type) {
		if (mUserActivityCounters == null) {
		initUserActivityLocked();
		}
		if (event >= 0 && event < NUM_USER_ACTIVITY_TYPES) {
		mUserActivityCounters[event].stepAtomic();
		if (type >= 0 && type < NUM_USER_ACTIVITY_TYPES) {
		mUserActivityCounters[type].stepAtomic();
		} else {
		Slog.w(TAG, "Unknown user activity event " + event + " was specified.",
		Slog.w(TAG, "Unknown user activity type " + type + " was specified.",
		new Throwable());
		}
		}

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -571,8 +571,7 @@ public class Notifier {
		/**
		* Called when there has been user activity.
		*/
		public void onUserActivity(int displayGroupId, @PowerManager.UserActivityEvent int event,
		int uid) {
		public void onUserActivity(int displayGroupId, int event, int uid) {
		if (DEBUG) {
		Slog.d(TAG, "onUserActivity: event=" + event + ", uid=" + uid);
		}

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

+7 −20

Original line number	Diff line number	Diff line
		@@ -74,8 +74,6 @@ public class PowerGroup {
		private long mLastPowerOnTime;
		private long mLastUserActivityTime;
		private long mLastUserActivityTimeNoChangeLights;
		@PowerManager.UserActivityEvent
		private int mLastUserActivityEvent;
		/** Timestamp (milliseconds since boot) of the last time the power group was awoken.*/
		private long mLastWakeTime;
		/** Timestamp (milliseconds since boot) of the last time the power group was put to sleep. */
		@@ -246,7 +244,7 @@ public class PowerGroup {
		return true;
		}

		boolean dozeLocked(long eventTime, int uid, @PowerManager.GoToSleepReason int reason) {
		boolean dozeLocked(long eventTime, int uid, int reason) {
		if (eventTime < getLastWakeTimeLocked() \|\| !isInteractive(mWakefulness)) {
		return false;
		}
		@@ -255,14 +253,9 @@ public class PowerGroup {
		try {
		reason = Math.min(PowerManager.GO_TO_SLEEP_REASON_MAX,
		Math.max(reason, PowerManager.GO_TO_SLEEP_REASON_MIN));
		long millisSinceLastUserActivity = eventTime - Math.max(
		mLastUserActivityTimeNoChangeLights, mLastUserActivityTime);
		Slog.i(TAG, "Powering off display group due to "
		+ PowerManager.sleepReasonToString(reason)
		+ " (groupId= " + getGroupId() + ", uid= " + uid
		+ ", millisSinceLastUserActivity=" + millisSinceLastUserActivity
		+ ", lastUserActivityEvent=" + PowerManager.userActivityEventToString(
		mLastUserActivityEvent) + ")...");
		+ PowerManager.sleepReasonToString(reason) + " (groupId= " + getGroupId()
		+ ", uid= " + uid + ")...");

		setSandmanSummonedLocked(/* isSandmanSummoned= */ true);
		setWakefulnessLocked(WAKEFULNESS_DOZING, eventTime, uid, reason, /* opUid= */ 0,
		@@ -273,16 +266,14 @@ public class PowerGroup {
		return true;
		}

		boolean sleepLocked(long eventTime, int uid, @PowerManager.GoToSleepReason int reason) {
		boolean sleepLocked(long eventTime, int uid, int reason) {
		if (eventTime < mLastWakeTime \|\| getWakefulnessLocked() == WAKEFULNESS_ASLEEP) {
		return false;
		}

		Trace.traceBegin(Trace.TRACE_TAG_POWER, "sleepPowerGroup");
		try {
		Slog.i(TAG,
		"Sleeping power group (groupId=" + getGroupId() + ", uid=" + uid + ", reason="
		+ PowerManager.sleepReasonToString(reason) + ")...");
		Slog.i(TAG, "Sleeping power group (groupId=" + getGroupId() + ", uid=" + uid + ")...");
		setSandmanSummonedLocked(/* isSandmanSummoned= */ true);
		setWakefulnessLocked(WAKEFULNESS_ASLEEP, eventTime, uid, reason, /* opUid= */0,
		/* opPackageName= / null, / details= */ null);
		@@ -296,20 +287,16 @@ public class PowerGroup {
		return mLastUserActivityTime;
		}

		void setLastUserActivityTimeLocked(long lastUserActivityTime,
		@PowerManager.UserActivityEvent int event) {
		void setLastUserActivityTimeLocked(long lastUserActivityTime) {
		mLastUserActivityTime = lastUserActivityTime;
		mLastUserActivityEvent = event;
		}

		public long getLastUserActivityTimeNoChangeLightsLocked() {
		return mLastUserActivityTimeNoChangeLights;
		}

		public void setLastUserActivityTimeNoChangeLightsLocked(long time,
		@PowerManager.UserActivityEvent int event) {
		public void setLastUserActivityTimeNoChangeLightsLocked(long time) {
		mLastUserActivityTimeNoChangeLights = time;
		mLastUserActivityEvent = event;
		}

		public int getUserActivitySummaryLocked() {