Merge "Fix testRegisterUsageCallback"

am: 899283d833

Change-Id: I7ec1e3a05971e8e0448289e3c3f979fd7dcfe144
This commit is contained in:
Remi NGUYEN VAN
2018-05-08 02:00:59 -07:00
committed by android-build-merger

View File

@@ -963,7 +963,6 @@ public class NetworkStatsServiceTest {
// verify service has empty history for wifi // verify service has empty history for wifi
assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0); assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
String callingPackage = "the.calling.package";
long thresholdInBytes = 1L; // very small; should be overriden by framework long thresholdInBytes = 1L; // very small; should be overriden by framework
DataUsageRequest inputRequest = new DataUsageRequest( DataUsageRequest inputRequest = new DataUsageRequest(
DataUsageRequest.REQUEST_ID_UNSET, sTemplateWifi, thresholdInBytes); DataUsageRequest.REQUEST_ID_UNSET, sTemplateWifi, thresholdInBytes);
@@ -983,7 +982,7 @@ public class NetworkStatsServiceTest {
// Register and verify request and that binder was called // Register and verify request and that binder was called
DataUsageRequest request = DataUsageRequest request =
mService.registerUsageCallback(callingPackage, inputRequest, mService.registerUsageCallback(mServiceContext.getOpPackageName(), inputRequest,
messenger, mBinder); messenger, mBinder);
assertTrue(request.requestId > 0); assertTrue(request.requestId > 0);
assertTrue(Objects.equals(sTemplateWifi, request.template)); assertTrue(Objects.equals(sTemplateWifi, request.template));