Add the RequiresPermission annotation to UsageStats APIs. (9a21fb8e) · Commits · e / os / android_frameworks_base

core/api/current.txt

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -9861,13 +9861,13 @@ package android.app.usage {
	public final class UsageStatsManager {		public final class UsageStatsManager {
	method public int getAppStandbyBucket();		method public int getAppStandbyBucket();
	method public boolean isAppInactive(String);		method public boolean isAppInactive(String);
	method public java.util.Map<java.lang.String,android.app.usage.UsageStats> queryAndAggregateUsageStats(long, long);		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.Map<java.lang.String,android.app.usage.UsageStats> queryAndAggregateUsageStats(long, long);
	method public java.util.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long);		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long);
	method public java.util.List<android.app.usage.EventStats> queryEventStats(int, long, long);		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.EventStats> queryEventStats(int, long, long);
	method public android.app.usage.UsageEvents queryEvents(long, long);		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public android.app.usage.UsageEvents queryEvents(long, long);
	method @FlaggedApi("android.app.usage.filter_based_event_query_api") @Nullable @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public android.app.usage.UsageEvents queryEvents(@NonNull android.app.usage.UsageEventsQuery);		method @FlaggedApi("android.app.usage.filter_based_event_query_api") @Nullable @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public android.app.usage.UsageEvents queryEvents(@NonNull android.app.usage.UsageEventsQuery);
	method public android.app.usage.UsageEvents queryEventsForSelf(long, long);		method public android.app.usage.UsageEvents queryEventsForSelf(long, long);
	method public java.util.List<android.app.usage.UsageStats> queryUsageStats(int, long, long);		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.UsageStats> queryUsageStats(int, long, long);
	field @FlaggedApi("android.app.usage.user_interaction_type_api") public static final String EXTRA_EVENT_ACTION = "android.app.usage.extra.EVENT_ACTION";		field @FlaggedApi("android.app.usage.user_interaction_type_api") public static final String EXTRA_EVENT_ACTION = "android.app.usage.extra.EVENT_ACTION";
	field @FlaggedApi("android.app.usage.user_interaction_type_api") public static final String EXTRA_EVENT_CATEGORY = "android.app.usage.extra.EVENT_CATEGORY";		field @FlaggedApi("android.app.usage.user_interaction_type_api") public static final String EXTRA_EVENT_CATEGORY = "android.app.usage.extra.EVENT_CATEGORY";
	field public static final int INTERVAL_BEST = 4; // 0x4		field public static final int INTERVAL_BEST = 4; // 0x4

core/java/android/app/usage/UsageStatsManager.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -480,6 +480,7 @@ public final class UsageStatsManager {
	* @see #INTERVAL_BEST		* @see #INTERVAL_BEST
	*/		*/
	@UserHandleAware		@UserHandleAware
			@RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
	public List<UsageStats> queryUsageStats(int intervalType, long beginTime, long endTime) {		public List<UsageStats> queryUsageStats(int intervalType, long beginTime, long endTime) {
	try {		try {
	@SuppressWarnings("unchecked")		@SuppressWarnings("unchecked")
	@@ -511,6 +512,7 @@ public final class UsageStatsManager {
	* in terms of "Unix time", see {@link java.lang.System#currentTimeMillis}.		* in terms of "Unix time", see {@link java.lang.System#currentTimeMillis}.
	* @return A list of {@link ConfigurationStats}		* @return A list of {@link ConfigurationStats}
	*/		*/
			@RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
	public List<ConfigurationStats> queryConfigurations(int intervalType, long beginTime,		public List<ConfigurationStats> queryConfigurations(int intervalType, long beginTime,
	long endTime) {		long endTime) {
	try {		try {
	@@ -558,6 +560,7 @@ public final class UsageStatsManager {
	* @see #INTERVAL_YEARLY		* @see #INTERVAL_YEARLY
	* @see #INTERVAL_BEST		* @see #INTERVAL_BEST
	*/		*/
			@RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
	public List<EventStats> queryEventStats(int intervalType, long beginTime, long endTime) {		public List<EventStats> queryEventStats(int intervalType, long beginTime, long endTime) {
	try {		try {
	@SuppressWarnings("unchecked")		@SuppressWarnings("unchecked")
	@@ -587,6 +590,7 @@ public final class UsageStatsManager {
	* in terms of "Unix time", see {@link java.lang.System#currentTimeMillis}.		* in terms of "Unix time", see {@link java.lang.System#currentTimeMillis}.
	* @return A {@link UsageEvents}.		* @return A {@link UsageEvents}.
	*/		*/
			@RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
	public UsageEvents queryEvents(long beginTime, long endTime) {		public UsageEvents queryEvents(long beginTime, long endTime) {
	try {		try {
	UsageEvents iter = mService.queryEvents(beginTime, endTime,		UsageEvents iter = mService.queryEvents(beginTime, endTime,
	@@ -665,6 +669,7 @@ public final class UsageStatsManager {
	* in terms of "Unix time", see {@link java.lang.System#currentTimeMillis}.		* in terms of "Unix time", see {@link java.lang.System#currentTimeMillis}.
	* @return A {@link java.util.Map} keyed by package name		* @return A {@link java.util.Map} keyed by package name
	*/		*/
			@RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
	public Map<String, UsageStats> queryAndAggregateUsageStats(long beginTime, long endTime) {		public Map<String, UsageStats> queryAndAggregateUsageStats(long beginTime, long endTime) {
	List<UsageStats> stats = queryUsageStats(INTERVAL_BEST, beginTime, endTime);		List<UsageStats> stats = queryUsageStats(INTERVAL_BEST, beginTime, endTime);
	if (stats.isEmpty()) {		if (stats.isEmpty()) {