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

Commit 3c4d3948 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "API Feedback on setActiveConfigsChangedOperation"

parents 03da8055 976eff17

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ package android.app { 
    method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public byte[] getStatsMetadata() throws android.app.StatsManager.StatsUnavailableException;

    method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void removeConfig(long) throws android.app.StatsManager.StatsUnavailableException;

    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public boolean removeConfiguration(long);

    method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public long[] setActiveConfigsChangedOperation(@Nullable android.app.PendingIntent) throws android.app.StatsManager.StatsUnavailableException;

    method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) @NonNull public long[] setActiveConfigsChangedOperation(@Nullable android.app.PendingIntent) throws android.app.StatsManager.StatsUnavailableException;

    method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void setBroadcastSubscriber(android.app.PendingIntent, long, long) throws android.app.StatsManager.StatsUnavailableException;

    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public boolean setBroadcastSubscriber(long, long, android.app.PendingIntent);

    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public boolean setDataFetchOperation(long, android.app.PendingIntent);

core/java/android/app/StatsManager.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app; 
import static android.Manifest.permission.DUMP;

import static android.Manifest.permission.PACKAGE_USAGE_STATS;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;
@@ -295,7 +296,7 @@ public final class StatsManager { 
     * @throws StatsUnavailableException if unsuccessful due to failing to connect to stats service

     */

    @RequiresPermission(allOf = { DUMP, PACKAGE_USAGE_STATS })

    public long[] setActiveConfigsChangedOperation(@Nullable PendingIntent pendingIntent)

    public @NonNull long[] setActiveConfigsChangedOperation(@Nullable PendingIntent pendingIntent)

            throws StatsUnavailableException {

        synchronized (this) {

            try {