commit 687ddf69283940b66a1d89b555b35ed9c60d808a
author Jeff Sharkey <jsharkey@google.com> Mon Apr 16 16:54:32 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 16 16:54:32 2018 +0000
tree 0885dd218b1f75883164dfa39e42d58cf098b489
parent 04efa577988736c994a2ddd5e66f0a38157b764f
parent 069002e639101baf5312fada3761908b87b66125

Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev

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