| commit | 929ec92b84eeef78e9ffec85decf46c16bce990d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jan 03 23:35:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 03 23:35:58 2022 +0000 |
| tree | 057832a06ed586f4c8dffcf4d56e9c9eb6b541ed | |
| parent | 3f33d22d924463b3c553216c2248a4515250796b [diff] | |
| parent | 98feac9487e0d43136bea6b397df43f8a8cbcd46 [diff] |
Merge changes from topics "ms25-appops", "ms28-service-fix" am: 7b8430e17e am: dde5e7bf33 am: 98feac9487 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934458 Change-Id: Ie1f9bfb4c6a3b0b2a04afbe50a7c15869b680c6d
diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java index 8980bbc..b64fbdb 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java
@@ -192,8 +192,8 @@ 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.