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

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

Merge "StatsManager setActiveConfigsChangedOperation API"

parents 275c3ec6 d0194802

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,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 void setActiveConfigsChangedOperation(@Nullable android.app.PendingIntent) throws android.app.StatsManager.StatsUnavailableException;

    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}) 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

+5 −2
Original line number Diff line number Diff line
@@ -289,20 +289,23 @@ public final class StatsManager { 
     * @param pendingIntent the PendingIntent to use when broadcasting info to the subscriber

     *                      associated with the given subscriberId. May be null, in which case

     *                      it removes any associated pending intent for this client.

     * @return A list of configs that are currently active for this client. If the pendingIntent is

     *         null, this will be an empty list.

     * @throws StatsUnavailableException if unsuccessful due to failing to connect to stats service

     */

    @RequiresPermission(allOf = { DUMP, PACKAGE_USAGE_STATS })

    public void setActiveConfigsChangedOperation(@Nullable PendingIntent pendingIntent)

    public long[] setActiveConfigsChangedOperation(@Nullable PendingIntent pendingIntent)

            throws StatsUnavailableException {

        synchronized (this) {

            try {

                IStatsManager service = getIStatsManagerLocked();

                if (pendingIntent == null) {

                    service.removeActiveConfigsChangedOperation(mContext.getOpPackageName());

                    return new long[0];

                } else {

                    // Extracts IIntentSender from the PendingIntent and turns it into an IBinder.

                    IBinder intentSender = pendingIntent.getTarget().asBinder();

                    service.setActiveConfigsChangedOperation(intentSender,

                    return service.setActiveConfigsChangedOperation(intentSender,

                            mContext.getOpPackageName());

                }