diff options
| author | Ahaan Ugale <augale@google.com> | 2021-06-26 03:27:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-26 03:27:40 +0000 |
| commit | e288fd3106c32070655bd3fd666b4ed8ad4f3dc0 (patch) | |
| tree | 4d03404fb5ceca702a7cfa0d7b93a5e4d2691e0f /core/java | |
| parent | 2cd378aef97e56e58a1e99114c2594b64d6e84bb (diff) | |
| parent | c27cb748b18bd0e68fc0b3b417589239b8187e25 (diff) | |
Merge "Fix finishOp for HotwordDetectionService" into sc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/AppOpsManagerInternal.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/core/java/android/app/AppOpsManagerInternal.java b/core/java/android/app/AppOpsManagerInternal.java index a757e32d0d75..7c85df831ce9 100644 --- a/core/java/android/app/AppOpsManagerInternal.java +++ b/core/java/android/app/AppOpsManagerInternal.java @@ -16,9 +16,9 @@ package android.app; -import android.app.AppOpsManager.AttributionFlags; import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.AppOpsManager.AttributionFlags; import android.content.AttributionSource; import android.os.IBinder; import android.util.SparseArray; @@ -29,6 +29,7 @@ import com.android.internal.util.function.DecFunction; import com.android.internal.util.function.HeptFunction; import com.android.internal.util.function.HexFunction; import com.android.internal.util.function.QuadFunction; +import com.android.internal.util.function.QuintConsumer; import com.android.internal.util.function.QuintFunction; import com.android.internal.util.function.TriFunction; import com.android.internal.util.function.UndecFunction; @@ -155,6 +156,21 @@ public abstract class AppOpsManagerInternal { SyncNotedAppOp> superImpl); /** + * Allows overriding finish op. + * + * @param clientId The client state. + * @param code The op code to finish. + * @param uid The UID for which the op was noted. + * @param packageName The package for which it was noted. {@code null} for system package. + * @param attributionTag the attribution tag. + */ + default void finishOperation(IBinder clientId, int code, int uid, String packageName, + String attributionTag, + @NonNull QuintConsumer<IBinder, Integer, Integer, String, String> superImpl) { + superImpl.accept(clientId, code, uid, packageName, attributionTag); + } + + /** * Allows overriding finish proxy op. * * @param code The op code to finish. |