commit 4de48809c089da50e684c7c64bb355345f8b740a
author Jeff Sharkey <jsharkey@google.com> Mon Apr 16 16:39:55 2018 +0000
committer Jeff Sharkey <jsharkey@google.com> Mon Apr 16 16:39:55 2018 +0000
tree 24b658aecf1198d941febfd522eeaef584f9134a
parent fbb37a7f611f02c7ef871c3fce36eecb4380f229

Revert "OP_GET_USAGE_STATS should be noted, not checked."

This reverts commit fbb37a7f611f02c7ef871c3fce36eecb4380f229.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing

tests/net/java/com/android/server/net/NetworkStatsAccessTest.java

diff --git a/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java b/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java
index b870bbd..23318c2 100644
--- a/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java
+++ b/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java
@@ -176,7 +176,7 @@
     }
 
     private void setHasAppOpsPermission(int appOpsMode, boolean hasPermission) {
-        when(mAppOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS, TEST_UID, TEST_PKG))
+        when(mAppOps.checkOp(AppOpsManager.OP_GET_USAGE_STATS, TEST_UID, TEST_PKG))
                 .thenReturn(appOpsMode);
         when(mContext.checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS)).thenReturn(
                 hasPermission ? PackageManager.PERMISSION_GRANTED