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

Commit 35f6cc23 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by Automerger Merge Worker
Browse files

Merge "Log mode changes to OP_RUN_ANY_IN_BACKGROUND" into udc-dev am: c998dec9 

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



Change-Id: Id7e05e70eab10ec0b66ec4917935fd311a43e153
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12ec3dc1 c998dec9

core/java/android/app/AppOpsManager.java

+29 −0
Original line number Original line Diff line number Diff line
@@ -60,13 +60,16 @@ import android.os.RemoteCallback; 
import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Log;

import android.util.LongSparseArray;

import android.util.LongSparseArray;

import android.util.LongSparseLongArray;

import android.util.LongSparseLongArray;

import android.util.Pools;

import android.util.Pools;

import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseArray;





import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.GuardedBy;
@@ -179,6 +182,8 @@ import java.util.function.Supplier; 
 */

 */

@SystemService(Context.APP_OPS_SERVICE)

@SystemService(Context.APP_OPS_SERVICE)

public class AppOpsManager {

public class AppOpsManager {

    private static final String LOG_TAG = "AppOpsManager";



    /**

    /**

     * This is a subtle behavior change to {@link #startWatchingMode}.

     * This is a subtle behavior change to {@link #startWatchingMode}.

     *

     *
@@ -7517,6 +7522,7 @@ public class AppOpsManager { 
     */

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)

    @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)

    public void setUidMode(int code, int uid, @Mode int mode) {

    public void setUidMode(int code, int uid, @Mode int mode) {

        logAnySeriousModeChanges(code, uid, null, mode);

        try {

        try {

            mService.setUidMode(code, uid, mode);

            mService.setUidMode(code, uid, mode);

        } catch (RemoteException e) {

        } catch (RemoteException e) {
@@ -7537,6 +7543,7 @@ public class AppOpsManager { 
    @SystemApi

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)

    @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)

    public void setUidMode(@NonNull String appOp, int uid, @Mode int mode) {

    public void setUidMode(@NonNull String appOp, int uid, @Mode int mode) {

        logAnySeriousModeChanges(strOpToOp(appOp), uid, null, mode);

        try {

        try {

            mService.setUidMode(AppOpsManager.strOpToOp(appOp), uid, mode);

            mService.setUidMode(AppOpsManager.strOpToOp(appOp), uid, mode);

        } catch (RemoteException e) {

        } catch (RemoteException e) {
@@ -7572,11 +7579,32 @@ public class AppOpsManager { 
        }

        }

    }

    }





    private void logAnySeriousModeChanges(int code, int uid, String packageName, @Mode int mode) {

        // TODO (b/280869337): Remove this once we have the required data.

        if (code != OP_RUN_ANY_IN_BACKGROUND || mode == MODE_ALLOWED) {

            return;

        }

        final StringBuilder log = new StringBuilder("Attempt to change RUN_ANY_IN_BACKGROUND to ")

                .append(modeToName(mode))

                .append(" for uid: ")

                .append(UserHandle.formatUid(uid))

                .append(" package: ")

                .append(packageName)

                .append(" by: ")

                .append(mContext.getOpPackageName());

        if (Process.myUid() == Process.SYSTEM_UID) {

            Slog.wtfStack(LOG_TAG, log.toString());

        } else {

            Log.w(LOG_TAG, log.toString());

        }

    }



    /** @hide */

    /** @hide */

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    @TestApi

    @TestApi

    @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)

    @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)

    public void setMode(int code, int uid, String packageName, @Mode int mode) {

    public void setMode(int code, int uid, String packageName, @Mode int mode) {

        logAnySeriousModeChanges(code, uid, packageName, mode);

        try {

        try {

            mService.setMode(code, uid, packageName, mode);

            mService.setMode(code, uid, packageName, mode);

        } catch (RemoteException e) {

        } catch (RemoteException e) {
@@ -7599,6 +7627,7 @@ public class AppOpsManager { 
    @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)

    @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)

    public void setMode(@NonNull String op, int uid, @Nullable String packageName,

    public void setMode(@NonNull String op, int uid, @Nullable String packageName,

            @Mode int mode) {

            @Mode int mode) {

        logAnySeriousModeChanges(strOpToOp(op), uid, packageName, mode);

        try {

        try {

            mService.setMode(strOpToOp(op), uid, packageName, mode);

            mService.setMode(strOpToOp(op), uid, packageName, mode);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

services/core/java/com/android/server/appop/AppOpsService.java

+17 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ import static android.app.AppOpsManager.OP_RECEIVE_AMBIENT_TRIGGER_AUDIO; 
import static android.app.AppOpsManager.OP_RECORD_AUDIO;

import static android.app.AppOpsManager.OP_RECORD_AUDIO;

import static android.app.AppOpsManager.OP_RECORD_AUDIO_HOTWORD;

import static android.app.AppOpsManager.OP_RECORD_AUDIO_HOTWORD;

import static android.app.AppOpsManager.OP_RECORD_AUDIO_SANDBOXED;

import static android.app.AppOpsManager.OP_RECORD_AUDIO_SANDBOXED;

import static android.app.AppOpsManager.OP_RUN_ANY_IN_BACKGROUND;

import static android.app.AppOpsManager.OP_VIBRATE;

import static android.app.AppOpsManager.OP_VIBRATE;

import static android.app.AppOpsManager.OnOpStartedListener.START_TYPE_FAILED;

import static android.app.AppOpsManager.OnOpStartedListener.START_TYPE_FAILED;

import static android.app.AppOpsManager.OnOpStartedListener.START_TYPE_STARTED;

import static android.app.AppOpsManager.OnOpStartedListener.START_TYPE_STARTED;
@@ -1769,6 +1770,11 @@ public class AppOpsService extends IAppOpsService.Stub { 
    @Override

    @Override

    public void setUidMode(int code, int uid, int mode) {

    public void setUidMode(int code, int uid, int mode) {

        setUidMode(code, uid, mode, null);

        setUidMode(code, uid, mode, null);

        if (code == OP_RUN_ANY_IN_BACKGROUND) {

            // TODO (b/280869337): Remove this once we have the required data.

            Slog.wtfStack(TAG, "setUidMode called for RUN_ANY_IN_BACKGROUND by uid: "

                    + UserHandle.formatUid(Binder.getCallingUid()));

        }

    }

    }





    private void setUidMode(int code, int uid, int mode,

    private void setUidMode(int code, int uid, int mode,
@@ -1944,6 +1950,17 @@ public class AppOpsService extends IAppOpsService.Stub { 
    @Override

    @Override

    public void setMode(int code, int uid, @NonNull String packageName, int mode) {

    public void setMode(int code, int uid, @NonNull String packageName, int mode) {

        setMode(code, uid, packageName, mode, null);

        setMode(code, uid, packageName, mode, null);

        final int callingUid = Binder.getCallingUid();

        if (code == OP_RUN_ANY_IN_BACKGROUND && mode != MODE_ALLOWED) {

            // TODO (b/280869337): Remove this once we have the required data.

            final String callingPackage = ArrayUtils.firstOrNull(getPackagesForUid(callingUid));

            Slog.wtfStack(TAG,

                    "RUN_ANY_IN_BACKGROUND for package " + packageName + " changed to mode: "

                            + modeToName(mode) + " via setMode. Calling package: " + callingPackage

                            + ", calling uid: " + UserHandle.formatUid(callingUid)

                            + ", calling pid: " + Binder.getCallingPid()

                            + ", system pid: " + Process.myPid());

        }

    }

    }





    void setMode(int code, int uid, @NonNull String packageName, int mode,

    void setMode(int code, int uid, @NonNull String packageName, int mode,