Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 203fef02 authored by Rajeev Kumar's avatar Rajeev Kumar Committed by Android (Google) Code Review
Browse files

Merge "deprecate #queryEvents(long, long)" into main

parents 82f4c475 095d2e00

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10012,7 +10012,7 @@ package android.app.usage { 
    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) 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.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.EventStats> queryEventStats(int, long, long);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public android.app.usage.UsageEvents queryEvents(long, long);

    method @Deprecated @FlaggedApi("android.app.usage.deprecate_old_query_events_api") @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 public android.app.usage.UsageEvents queryEventsForSelf(long, long);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.UsageStats> queryUsageStats(int, long, long);

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

+6 −0
Original line number Diff line number Diff line
@@ -587,7 +587,13 @@ public final class UsageStatsManager { 
     * @param endTime The exclusive end of the range of events to include in the results. Defined

     *                in terms of "Unix time", see {@link java.lang.System#currentTimeMillis}.

     * @return A {@link UsageEvents}.

     * @deprecated Use {@link #queryEvents(UsageEventsQuery)} instead because it allows a caller to

     * filter the results by event types and packages they're interested in.

     * Future Android versions may no longer support this API due to performance and memory

     * concerns.

     */

    @FlaggedApi(Flags.FLAG_DEPRECATE_OLD_QUERY_EVENTS_API)

    @Deprecated

    @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)

    public UsageEvents queryEvents(long beginTime, long endTime) {

        try {

core/java/android/app/usage/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@ flag { 
    bug: "194321117"

}



flag {

    name: "deprecate_old_query_events_api"

    is_exported: true

    namespace: "backstage_power"

    description: "Feature flag to deprecate old event query API"

    bug: "413479539"

}



flag {

    name: "get_app_bytes_by_data_type_api"

    is_exported: true