| commit | 55393189f14e8931876eb7e2b3858aeef44a3385 | [log] [tgz] |
|---|---|---|
| author | android-build-team Robot <android-build-team-robot@google.com> | Mon Apr 16 20:14:42 2018 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Mon Apr 16 20:14:42 2018 +0000 |
| tree | 912fc0201bf248d28b4d1fbe5cf13314d86af623 | |
| parent | 3e432468f4b550d6f8df3d0e0e42bbf75fe33902 [diff] | |
| parent | d810e5e91488644d2fba90521c988cf5392ce5e3 [diff] |
Merge cherrypicks of [3907239, 3907816] into pi-release Change-Id: I90cbf2491df8c8606b9744aa732647ec26d3bddc
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