Merge changes from topics "ms25-appops", "ms28-service-fix" am: bbb36e91ee am: 113ca82dd5 am: c6b372ce58 am: 4ad2cf568c

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

Change-Id: I1575b5e2e5a98ead3abed9b6d87c580fd4d490bb
This commit is contained in:
Treehugger Robot
2022-01-03 23:37:25 +00:00
committed by Automerger Merge Worker

View File

@@ -192,8 +192,8 @@ public final class NetworkStatsAccess {
AppOpsManager appOps = (AppOpsManager) context.getSystemService(
Context.APP_OPS_SERVICE);
final int mode = appOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS,
callingUid, callingPackage);
final int mode = appOps.noteOp(AppOpsManager.OPSTR_GET_USAGE_STATS,
callingUid, callingPackage, null /* attributionTag */, null /* message */);
if (mode == AppOpsManager.MODE_DEFAULT) {
// The default behavior here is to check if PackageManager has given the app
// permission.