Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add TEST_MAPPING for network policy related logic."

Browse Source
This commit is contained in:
Sudheer Shanka
2019-10-25 17:43:35 +00:00
committed by Android (Google) Code Review
parent 6432227da2 b2ed1c3fa6
commit f49633954b
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -365,7 +365,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
"com.android.server.net.action.SNOOZE_RAPID";
/**
* Indicates the maximum wait time for admin data to be available;
* Indicates the maximum wait time for admin data to be available.
*/
private static final long WAIT_FOR_ADMIN_DATA_TIMEOUT_MS = 10_000;

31
services/core/java/com/android/server/net/TEST_MAPPING Normal file
View File

@@ -0,0 +1,31 @@
{
"presubmit": [
{
"name": "CtsHostsideNetworkTests",
"file_patterns": ["(/|^)NetworkPolicy[^/]*\\.java"],
"options": [
{
"include-filter": "com.android.cts.net.HostsideRestrictBackgroundNetworkTests"
},
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
},
{
"name": "FrameworksServicesTests",
"file_patterns": ["(/|^)NetworkPolicy[^/]*\\.java"],
"options": [
{
"include-filter": "com.android.server.net."
},
{
"include-annotation": "android.platform.test.annotations.Presubmit"
},
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
}
]
}

2
services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
View File

@@ -122,6 +122,7 @@ import android.os.RemoteException;
import android.os.SimpleClock;
import android.os.SystemClock;
import android.os.UserHandle;
import android.platform.test.annotations.Presubmit;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionPlan;
@@ -196,6 +197,7 @@ import java.util.stream.Collectors;
*/
@RunWith(AndroidJUnit4.class)
@MediumTest
@Presubmit
public class NetworkPolicyManagerServiceTest {
private static final String TAG = "NetworkPolicyManagerServiceTest";