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

Commit fb42cf7e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topics "ms25-appops", "ms28-service-fix" am: 7b8430e1 am:... 

Merge changes from topics "ms25-appops", "ms28-service-fix" am: 7b8430e1 am: dde5e7bf am: 98feac94 am: 929ec92b

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

Change-Id: I1575b5e2e5a98ead3abed9b6d87c580fd4d490bb
parents 35aa2d7a 929ec92b

packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java

+2 −2
Original line number Diff line number Diff line
@@ -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.