commit d0b9f983d6687fc88074926f5e5e5c1b7ac7ee97
author Remi NGUYEN VAN <reminv@google.com> Tue May 08 07:55:42 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 08 07:55:42 2018 +0000
tree 77afc3ebf58177373035e08ee861c98776be4187
parent c8613f9965065cfa05e5741a84c401a5fb983768
parent 14178014fc16456aa3944b1a5846431e90eeca99

Merge "Fix testRegisterUsageCallback"

tests/net/java/com/android/server/net/NetworkStatsServiceTest.java

diff --git a/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
index 17ca651..2fb9faf 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 @@
 
         // 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 @@
 
         // 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));