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

Commit eb75200b authored by Nate Myren's avatar Nate Myren
Browse files

Add start/finishProxyOp methods 

Test: atest AppOpEventCollectionTest
Fixes: 170336396
Change-Id: I825c58d615fe23e6529d1f877e45a896438dbf15
parent fc97abca

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -4376,6 +4376,7 @@ package android.app { 
    method @Deprecated public void checkPackage(int, @NonNull String);

    method @Deprecated public void finishOp(@NonNull String, int, @NonNull String);

    method public void finishOp(@NonNull String, int, @NonNull String, @Nullable String);

    method public void finishProxyOp(@NonNull String, int, @NonNull String, @Nullable String);

    method public boolean isOpActive(@NonNull String, int, @NonNull String);

    method @Deprecated public int noteOp(@NonNull String, int, @NonNull String);

    method public int noteOp(@NonNull String, int, @Nullable String, @Nullable String, @Nullable String);
@@ -4392,6 +4393,8 @@ package android.app { 
    method public int startOp(@NonNull String, int, @Nullable String, @Nullable String, @Nullable String);

    method @Deprecated public int startOpNoThrow(@NonNull String, int, @NonNull String);

    method public int startOpNoThrow(@NonNull String, int, @NonNull String, @NonNull String, @Nullable String);

    method public int startProxyOp(@NonNull String, int, @NonNull String, @Nullable String, @Nullable String);

    method public int startProxyOpNoThrow(@NonNull String, int, @NonNull String, @Nullable String, @Nullable String);

    method public void startWatchingActive(@NonNull String[], @NonNull java.util.concurrent.Executor, @NonNull android.app.AppOpsManager.OnOpActiveChangedListener);

    method public void startWatchingMode(@NonNull String, @Nullable String, @NonNull android.app.AppOpsManager.OnOpChangedListener);

    method public void startWatchingMode(@NonNull String, @Nullable String, int, @NonNull android.app.AppOpsManager.OnOpChangedListener);

core/java/android/app/AppOpsManager.java

+107 −0
Original line number Diff line number Diff line
@@ -7978,6 +7978,91 @@ public class AppOpsManager { 
            throw e.rethrowFromSystemServer();

        }

    }

    /**

     * Report that an application has started executing a long-running operation on behalf of

     * another application when handling an IPC. This function will verify that the calling uid and

     * proxied package name match, and if not, return {@link #MODE_IGNORED}.

     *

     * @param op The op to note

     * @param proxiedUid The uid to note the op for {@code null}

     * @param proxiedUid The package name the uid belongs to

     * @param proxiedAttributionTag The proxied {@link Context#createAttributionContext

     * attribution tag} or {@code null} for default attribution

     * @param message A message describing the reason the op was noted

     *

     * @return Returns {@link #MODE_ALLOWED} if the operation is allowed, or {@link #MODE_IGNORED}

     * if it is not allowed and should be silently ignored (without causing the app to crash).

     *

     * @throws SecurityException If the proxy or proxied app has been configured to crash on this

     * op.

     */

    public int startProxyOp(@NonNull String op, int proxiedUid, @NonNull String proxiedPackageName,

            @Nullable String proxiedAttributionTag, @Nullable String message) {

        final int mode = startProxyOpNoThrow(op, proxiedUid, proxiedPackageName,

                proxiedAttributionTag, message);

        if (mode == MODE_ERRORED) {

            throw new SecurityException("Proxy package " + mContext.getOpPackageName()

                    + " from uid " + Process.myUid() + " or calling package " + proxiedPackageName

                    + " from uid " + proxiedUid + " not allowed to perform "

                    + sOpNames[strOpToOp(op)]);

        }

        return mode;

    }



    /**

     *Like {@link #startProxyOp(String, int, String, String, String)} but instead

     * of throwing a {@link SecurityException} it returns {@link #MODE_ERRORED}.

     *

     * @param op The op to note

     * @param proxiedUid The uid to note the op for {@code null}

     * @param proxiedUid The package name the uid belongs to

     * @param proxiedAttributionTag The proxied {@link Context#createAttributionContext

     * attribution tag} or {@code null} for default attribution

     * @param message A message describing the reason the op was noted*

     * <p>This API requires package with the {@code proxiedPackageName} to belong to

     * {@code proxiedUid}.

     *

     * @return Returns {@link #MODE_ALLOWED} if the operation is allowed, or {@link #MODE_IGNORED}

     * if it is not allowed and should be silently ignored (without causing the app to crash).

     */

    public int startProxyOpNoThrow(@NonNull String op, int proxiedUid,

            @NonNull String proxiedPackageName, @Nullable String proxiedAttributionTag,

            @Nullable String message) {

        try {

            int opInt = strOpToOp(op);



            collectNoteOpCallsForValidation(opInt);

            int collectionMode = getNotedOpCollectionMode(proxiedUid, proxiedPackageName, opInt);

            boolean shouldCollectMessage = Process.myUid() == Process.SYSTEM_UID;

            if (collectionMode == COLLECT_ASYNC) {

                if (message == null) {

                    // Set stack trace as default message

                    message = getFormattedStackTrace();

                    shouldCollectMessage = true;

                }

            }



            int mode = mService.startProxyOperation(getClientId(), opInt, proxiedUid,

                    proxiedPackageName, proxiedAttributionTag, Process.myUid(),

                    mContext.getOpPackageName(), mContext.getAttributionTag(), false,

                    collectionMode == COLLECT_ASYNC, message, shouldCollectMessage);



            if (mode == MODE_ALLOWED) {

                if (collectionMode == COLLECT_SELF) {

                    collectNotedOpForSelf(opInt, proxiedAttributionTag);

                } else if (collectionMode == COLLECT_SYNC

                        // Only collect app-ops when the proxy is trusted

                        && mContext.checkPermission(Manifest.permission.UPDATE_APP_OPS_STATS, -1,

                        Process.myUid()) == PackageManager.PERMISSION_GRANTED) {

                    collectNotedOpSync(opInt, proxiedAttributionTag);

                }

            }



            return mode;

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @deprecated Use {@link #finishOp(String, int, String, String)} instead
@@ -8033,6 +8118,28 @@ public class AppOpsManager { 
        }

    }



    /**

     *  Report that an application is no longer performing an operation that had previously

     * been started with {@link #startProxyOp(String, int, String, String, String)}. There is no

     * validation of input or result; the parameters supplied here must be the exact same ones

     * previously passed in when starting the operation.

     * @param op The operation which was started

     * @param proxiedUid The uid the op was started on behalf of

     * @param proxiedPackageName The package the op was started on behalf of

     * @param proxiedAttributionTag The proxied {@link Context#createAttributionContext

     * attribution tag} or {@code null} for default attribution

     */

    public void finishProxyOp(@NonNull String op, int proxiedUid,

            @NonNull String proxiedPackageName, @Nullable String proxiedAttributionTag) {

        try {

            mService.finishProxyOperation(getClientId(), strOpToOp(op), proxiedUid,

                    proxiedPackageName, proxiedAttributionTag, Process.myUid(),

                    mContext.getOpPackageName(), mContext.getAttributionTag());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Checks whether the given op for a package is active, i.e. did someone call {@link #startOp}

     * without {@link #finishOp} yet.

core/java/com/android/internal/app/IAppOpsService.aidl

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,13 @@ interface IAppOpsService { 
            String proxiedAttributionTag, int proxyUid, String proxyPackageName,

            String proxyAttributionTag, boolean shouldCollectAsyncNotedOp, String message,

            boolean shouldCollectMessage);

    int startProxyOperation(IBinder clientId, int code, int proxiedUid, String proxiedPackageName,

            @nullable String proxiedAttributionTag, int proxyUid, String proxyPackageName,

            @nullable String proxyAttributionTag, boolean startIfModeDefault,

            boolean shouldCollectAsyncNotedOp, String message, boolean shouldCollectMessage);

    void finishProxyOperation(IBinder clientId, int code, int proxiedUid, String proxiedPackageName,

            @nullable String proxiedAttributionTag, int proxyUid, String proxyPackageName,

            @nullable String proxyAttributionTag);



    // Remaining methods are only used in Java.

    int checkPackage(int uid, String packageName);

non-updatable-api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -4376,6 +4376,7 @@ package android.app { 
    method @Deprecated public void checkPackage(int, @NonNull String);

    method @Deprecated public void finishOp(@NonNull String, int, @NonNull String);

    method public void finishOp(@NonNull String, int, @NonNull String, @Nullable String);

    method public void finishProxyOp(@NonNull String, int, @NonNull String, @Nullable String);

    method public boolean isOpActive(@NonNull String, int, @NonNull String);

    method @Deprecated public int noteOp(@NonNull String, int, @NonNull String);

    method public int noteOp(@NonNull String, int, @Nullable String, @Nullable String, @Nullable String);
@@ -4392,6 +4393,8 @@ package android.app { 
    method public int startOp(@NonNull String, int, @Nullable String, @Nullable String, @Nullable String);

    method @Deprecated public int startOpNoThrow(@NonNull String, int, @NonNull String);

    method public int startOpNoThrow(@NonNull String, int, @NonNull String, @NonNull String, @Nullable String);

    method public int startProxyOp(@NonNull String, int, @NonNull String, @Nullable String, @Nullable String);

    method public int startProxyOpNoThrow(@NonNull String, int, @NonNull String, @Nullable String, @Nullable String);

    method public void startWatchingActive(@NonNull String[], @NonNull java.util.concurrent.Executor, @NonNull android.app.AppOpsManager.OnOpActiveChangedListener);

    method public void startWatchingMode(@NonNull String, @Nullable String, @NonNull android.app.AppOpsManager.OnOpChangedListener);

    method public void startWatchingMode(@NonNull String, @Nullable String, int, @NonNull android.app.AppOpsManager.OnOpChangedListener);

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

+226 −50

File changed.

Preview size limit exceeded, changes collapsed.