LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
am: 687ddf6928

Change-Id: Ie9bcdc9736c04ab787efc193311a20d03718b593
This commit is contained in:
Jeff Sharkey
2018-04-16 10:19:39 -07:00
committed by android-build-merger
parent 330f1c0b18 687ddf6928
commit 569e8c496b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/net/java/com/android/server/net/NetworkStatsAccessTest.java
View File

@@ -176,7 +176,7 @@ public class NetworkStatsAccessTest {
} }
private void setHasAppOpsPermission(int appOpsMode, boolean hasPermission) { 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); .thenReturn(appOpsMode);
when(mContext.checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS)).thenReturn( when(mContext.checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS)).thenReturn(
hasPermission ? PackageManager.PERMISSION_GRANTED hasPermission ? PackageManager.PERMISSION_GRANTED