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

Commit 7821931e authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Make noteProxyOpNoThrow(String,String,int) public 

This is needed for proxing while not inside of a IPC.

Test: m -j update-api
Fixes: 126434248
Change-Id: I8dde23824b91acfae57ed86ef6871d82c8617193
parent f6410681

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4268,6 +4268,7 @@ package android.app { 
    method public int noteOpNoThrow(String, int, String);

    method public int noteProxyOp(String, String);

    method public int noteProxyOpNoThrow(String, String);

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

    method public static String permissionToOp(String);

    method public int startOp(String, int, String);

    method public int startOpNoThrow(String, int, String);

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ package android.app { 
    method @Deprecated @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, String, int[]);

    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, @NonNull String, @Nullable java.lang.String...);

    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getPackagesForOps(@Nullable String[]);

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

    method public static int opToDefaultMode(@NonNull String);

    method @Nullable public static String opToPermission(@NonNull String);

    method @RequiresPermission("android.permission.MANAGE_APP_OPS_MODES") public void setMode(String, int, String, int);

core/java/android/app/AppOpsManager.java

+1 −5
Original line number Diff line number Diff line
@@ -4375,8 +4375,7 @@ public class AppOpsManager { 
    }



    /**

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

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

     * Like {@link #noteProxyOpNoThrow(String, String)} but allows to specify the proxied uid.

     *

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

     * {@code proxiedUid}.
@@ -4385,10 +4384,7 @@ public class AppOpsManager { 
     * @param proxiedPackageName The package to note the op for or {@code null} if the op should be

     *                           noted for the "android" package

     * @param proxiedUid The uid the package belongs to

     *

     * @hide

     */

    @SystemApi

    public int noteProxyOpNoThrow(@NonNull String op, @Nullable String proxiedPackageName,

            int proxiedUid) {

        return noteProxyOpNoThrow(strOpToOp(op), proxiedPackageName, proxiedUid);