Merge "Track notification clicked events in UsageStats" (f9420f4d) · Commits · e / os / android_frameworks_base

api/system-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -688,6 +688,12 @@ package android.app.usage {
		field public static final java.lang.String SERVICE_INTERFACE = "android.app.usage.CacheQuotaService";
		}

		public static final class UsageEvents.Event {
		method public int getStandbyBucket();
		field public static final int NOTIFICATION_SEEN = 10; // 0xa
		field public static final int STANDBY_BUCKET_CHANGED = 11; // 0xb
		}

		public final class UsageStatsManager {
		method public int getAppStandbyBucket(java.lang.String);
		method public java.util.Map<java.lang.String, java.lang.Integer> getAppStandbyBuckets();

core/java/android/app/usage/UsageEvents.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package android.app.usage;

		import android.annotation.IntDef;
		import android.annotation.SystemApi;
		import android.content.res.Configuration;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -104,12 +105,14 @@ public final class UsageEvents implements Parcelable {
		* An event type denoting that a notification was viewed by the user.
		* @hide
		*/
		@SystemApi
		public static final int NOTIFICATION_SEEN = 10;

		/**
		* An event type denoting a change in App Standby Bucket.
		* @hide
		*/
		@SystemApi
		public static final int STANDBY_BUCKET_CHANGED = 11;

		/** @hide */
		@@ -257,6 +260,17 @@ public final class UsageEvents implements Parcelable {
		return mShortcutId;
		}

		/**
		* Returns the standby bucket of the app, if the event is of type
		* {@link #STANDBY_BUCKET_CHANGED}, otherwise returns 0.
		* @return the standby bucket associated with the event.
		* @hide
		*/
		@SystemApi
		public int getStandbyBucket() {
		return mBucket;
		}

		/** @hide */
		public Event getObfuscatedIfInstantApp() {
		if ((mFlags & FLAG_IS_PACKAGE_INSTANT_APP) == 0) {

services/core/java/com/android/server/notification/NotificationManagerService.java

+18 −1

Original line number	Diff line number	Diff line
		@@ -686,6 +686,7 @@ public class NotificationManagerService extends SystemService {
		sbn.getId(), Notification.FLAG_AUTO_CANCEL,
		Notification.FLAG_FOREGROUND_SERVICE, false, r.getUserId(),
		REASON_CLICK, null);
		reportUserInteraction(r);
		}
		}

		@@ -706,7 +707,7 @@ public class NotificationManagerService extends SystemService {
		.setSubtype(actionIndex));
		EventLogTags.writeNotificationActionClicked(key, actionIndex,
		r.getLifespanMs(now), r.getFreshnessMs(now), r.getExposureMs(now));
		// TODO: Log action click via UsageStats.
		reportUserInteraction(r);
		}
		}

		@@ -827,6 +828,7 @@ public class NotificationManagerService extends SystemService {
		NotificationRecord r = mNotificationsByKey.get(key);
		if (r != null) {
		r.recordDirectReplied();
		reportUserInteraction(r);
		}
		}
		}
		@@ -1758,6 +1760,10 @@ public class NotificationManagerService extends SystemService {
		return INotificationManager.Stub.asInterface(mService);
		}

		/**
		* Report to usage stats that the notification was seen.
		* @param r notification record
		*/
		protected void reportSeen(NotificationRecord r) {
		final int userId = r.sbn.getUserId();
		mAppUsageStats.reportEvent(r.sbn.getPackageName(),
		@@ -1766,6 +1772,17 @@ public class NotificationManagerService extends SystemService {
		UsageEvents.Event.NOTIFICATION_SEEN);
		}

		/**
		* Report to usage stats that the notification was clicked.
		* @param r notification record
		*/
		protected void reportUserInteraction(NotificationRecord r) {
		final int userId = r.sbn.getUserId();
		mAppUsageStats.reportEvent(r.sbn.getPackageName(),
		userId == UserHandle.USER_ALL ? UserHandle.USER_SYSTEM : userId,
		UsageEvents.Event.USER_INTERACTION);
		}

		@VisibleForTesting
		NotificationManagerInternal getInternalService() {
		return mInternalService;

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
		protected void reportSeen(NotificationRecord r) {
		return;
		}

		@Override
		protected void reportUserInteraction(NotificationRecord r) {
		return;
		}
		}

		@Before

services/usage/java/com/android/server/usage/AppStandbyController.java

+26 −6

Original line number	Diff line number	Diff line
		@@ -177,6 +177,12 @@ public class AppStandbyController {
		long mAppIdleParoleDurationMillis;
		long[] mAppStandbyScreenThresholds = SCREEN_TIME_THRESHOLDS;
		long[] mAppStandbyElapsedThresholds = ELAPSED_TIME_THRESHOLDS;
		/** Minimum time a strong usage event should keep the bucket elevated. */
		long mStrongUsageTimeoutMillis;
		/** Minimum time a notification seen event should keep the bucket elevated. */
		long mNotificationSeenTimeoutMillis;
		/** Minimum time a system update event should keep the buckets elevated. */
		long mSystemUpdateUsageTimeoutMillis;

		volatile boolean mAppIdleEnabled;
		boolean mAppIdleTempParoled;
		@@ -330,7 +336,7 @@ public class AppStandbyController {
		synchronized (mAppIdleLock) {
		AppUsageHistory appUsage = mAppIdleHistory.reportUsage(packageName, userId,
		STANDBY_BUCKET_ACTIVE, elapsedRealtime,
		elapsedRealtime + 2 * ONE_HOUR);
		elapsedRealtime + mStrongUsageTimeoutMillis);
		maybeInformListeners(packageName, userId, elapsedRealtime,
		appUsage.currentBucket, false);
		}
		@@ -628,11 +634,11 @@ public class AppStandbyController {
		if (event.mEventType == UsageEvents.Event.NOTIFICATION_SEEN) {
		mAppIdleHistory.reportUsage(appHistory, event.mPackage,
		STANDBY_BUCKET_WORKING_SET,
		elapsedRealtime, elapsedRealtime + 2 * ONE_HOUR);
		elapsedRealtime, elapsedRealtime + mNotificationSeenTimeoutMillis);
		} else {
		mAppIdleHistory.reportUsage(event.mPackage, userId,
		STANDBY_BUCKET_ACTIVE,
		elapsedRealtime, elapsedRealtime + 2 * ONE_HOUR);
		elapsedRealtime, elapsedRealtime + mStrongUsageTimeoutMillis);
		}

		final boolean userStartedInteracting =
		@@ -1114,10 +1120,10 @@ public class AppStandbyController {
		final PackageInfo pi = packages.get(i);
		String packageName = pi.packageName;
		if (pi.applicationInfo != null && pi.applicationInfo.isSystemApp()) {
		// Mark app as used for 4 hours. After that it can timeout to whatever the
		// Mark app as used for 2 hours. After that it can timeout to whatever the
		// past usage pattern was.
		mAppIdleHistory.reportUsage(packageName, userId, STANDBY_BUCKET_ACTIVE, 0,
		elapsedRealtime + 4 * ONE_HOUR);
		elapsedRealtime + mSystemUpdateUsageTimeoutMillis);
		}
		}
		}
		@@ -1396,6 +1402,12 @@ public class AppStandbyController {
		private static final String KEY_PAROLE_DURATION = "parole_duration";
		private static final String KEY_SCREEN_TIME_THRESHOLDS = "screen_thresholds";
		private static final String KEY_ELAPSED_TIME_THRESHOLDS = "elapsed_thresholds";
		private static final String KEY_STRONG_USAGE_HOLD_DURATION = "strong_usage_duration";
		private static final String KEY_NOTIFICATION_SEEN_HOLD_DURATION =
		"notification_seen_duration";
		private static final String KEY_SYSTEM_UPDATE_HOLD_DURATION =
		"system_update_usage_duration";


		private final KeyValueListParser mParser = new KeyValueListParser(',');

		@@ -1456,7 +1468,15 @@ public class AppStandbyController {
		ELAPSED_TIME_THRESHOLDS);
		mCheckIdleIntervalMillis = Math.min(mAppStandbyElapsedThresholds[1] / 4,
		COMPRESS_TIME ? ONE_MINUTE : 4 * 60 * ONE_MINUTE); // 4 hours

		mStrongUsageTimeoutMillis = mParser.getDurationMillis
		(KEY_STRONG_USAGE_HOLD_DURATION,
		COMPRESS_TIME ? ONE_MINUTE : 1 * ONE_HOUR);
		mNotificationSeenTimeoutMillis = mParser.getDurationMillis
		(KEY_NOTIFICATION_SEEN_HOLD_DURATION,
		COMPRESS_TIME ? 12 * ONE_MINUTE : 12 * ONE_HOUR);
		mSystemUpdateUsageTimeoutMillis = mParser.getDurationMillis
		(KEY_SYSTEM_UPDATE_HOLD_DURATION,
		COMPRESS_TIME ? 2 * ONE_MINUTE : 2 * ONE_HOUR);
		}
		}