commit 33a25ec466a095913d44bdf027e16cfe5d3320d3
author Jeff Sharkey <jsharkey@google.com> Mon Apr 16 16:50:34 2018 +0000
committer Jeff Sharkey <jsharkey@google.com> Mon Apr 16 16:50:34 2018 +0000
tree 9b6a5e7f4249e836d3ff8a88c373387c04e43d19
parent 4de48809c089da50e684c7c64bb355345f8b740a

Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""

This reverts commit 4de48809c089da50e684c7c64bb355345f8b740a.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I596d330d64942105f447bb613012bb11e281a805
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 23318c2..b870bbd 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.checkOp(AppOpsManager.OP_GET_USAGE_STATS, TEST_UID, TEST_PKG))
+        when(mAppOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS, TEST_UID, TEST_PKG))
                 .thenReturn(appOpsMode);
         when(mContext.checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS)).thenReturn(
                 hasPermission ? PackageManager.PERMISSION_GRANTED