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

Fix testRegisterUsageCallback

Browse Source 
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
This commit is contained in:
Remi NGUYEN VAN
2018-04-24 14:47:23 +09:00
parent fa1f79ac66
commit b1ff5a381e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
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));