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

Commit 790d695d authored by Mark Fasheh's avatar Mark Fasheh Committed by Automerger Merge Worker
Browse files

Merge "ActivityManagerService: UID frozen API should check permissions" into udc-dev am: 04fa4ea3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22154013



Change-Id: I1d5363ddad69cc71421bf51af05bdec048be44e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79d52d2a 04fa4ea3

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

+12 −1
Original line number Diff line number Diff line
@@ -182,6 +182,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;
@@ -7925,10 +7926,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!");

            }
@@ -7940,8 +7946,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);

        }