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

Commit c5799865 authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ActivityManagerService: UID frozen API should check permissions 

registerUidFrozenStateChangedCallback and
unregisterUidFrozenStateChangedCallback need to check that the caller
has sufficient permissions to use the API.

We should also be checking that input arguments are !null.

Bug: 274010383
Test: Tested on a Pixel 6
Change-Id: I6ccc2094ea2ef7573366f8ecd51c87a218f92e78
parent 1c00ee51

services/core/java/com/android/server/am/ActivityManagerService.java

+12 −1
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.PermissionMethod;

import android.annotation.PermissionName;

import android.annotation.RequiresPermission;

import android.annotation.UserIdInt;

import android.app.Activity;

import android.app.ActivityClient;
@@ -7773,10 +7774,15 @@ public class ActivityManagerService extends IActivityManager.Stub 
     *

     * @param callback remote callback object to be registered

     */

    @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)

    @Override

    public void registerUidFrozenStateChangedCallback(

            @NonNull IUidFrozenStateChangedCallback callback) {

        enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS,

                "registerUidFrozenStateChangedCallback()");

        Preconditions.checkNotNull(callback, "callback cannot be null");

        synchronized (mUidFrozenStateChangedCallbackList) {

            boolean registered = mUidFrozenStateChangedCallbackList.register(callback);

            final boolean registered = mUidFrozenStateChangedCallbackList.register(callback);

            if (!registered) {

                Slog.w(TAG, "Failed to register with RemoteCallbackList!");

            }
@@ -7788,8 +7794,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
     *

     * @param callback remote callback object to be unregistered

     */

    @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)

    @Override

    public void unregisterUidFrozenStateChangedCallback(

            @NonNull IUidFrozenStateChangedCallback callback) {

        enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS,

                "unregisterUidFrozenStateChangedCallback()");

        Preconditions.checkNotNull(callback, "callback cannot be null");

        synchronized (mUidFrozenStateChangedCallbackList) {

            mUidFrozenStateChangedCallbackList.unregister(callback);

        }