From b1ff5a381e80df25dec5c6b997b68bf3e17a8809 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 24 Apr 2018 14:47:23 +0900 Subject: [PATCH] Fix testRegisterUsageCallback noteOp (introduced in go/ag/3897834) checks that the calling uid matches the calling package, which is not correct when using a fake calling package. Use the real package of the test so permissions are checked properly. The test currently only fails this way in pi-dev as noteOp is only used in pi-dev. Change-Id: I9ac3717af9335ba9efa0b8842a2df0d7b69ec9ab Test: Fixed test now passes in pi-dev Bug: b/78487385 --- .../java/com/android/server/net/NetworkStatsServiceTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java index 17ca651b84..2fb9faf6ac 100644 --- a/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java +++ b/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java @@ -963,7 +963,6 @@ public class NetworkStatsServiceTest { // verify service has empty history for wifi assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0); - String callingPackage = "the.calling.package"; long thresholdInBytes = 1L; // very small; should be overriden by framework DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest.REQUEST_ID_UNSET, sTemplateWifi, thresholdInBytes); @@ -983,7 +982,7 @@ public class NetworkStatsServiceTest { // Register and verify request and that binder was called DataUsageRequest request = - mService.registerUsageCallback(callingPackage, inputRequest, + mService.registerUsageCallback(mServiceContext.getOpPackageName(), inputRequest, messenger, mBinder); assertTrue(request.requestId > 0); assertTrue(Objects.equals(sTemplateWifi, request.template));