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

Commit 5a671d6a authored by Jay Sullivan's avatar Jay Sullivan Committed by Android (Google) Code Review
Browse files

Merge "Fix startOpNoThrow argument annotation"

parents 616f3e72 42a2f5bc

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4749,7 +4749,7 @@ package android.app { 
    method @Deprecated public int startOp(@NonNull String, int, @NonNull String);

    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 startOpNoThrow(@NonNull String, int, @NonNull String, @Nullable 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);

core/java/android/app/AppOpsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -8189,7 +8189,7 @@ public class AppOpsManager { 
     * @see #startOp(String, int, String, String, String)

     */

    public int startOpNoThrow(@NonNull String op, int uid, @NonNull String packageName,

            @NonNull String attributionTag, @Nullable String message) {

            @Nullable String attributionTag, @Nullable String message) {

        return startOpNoThrow(strOpToOp(op), uid, packageName, false, attributionTag, message);

    }