Merge "Fix NetworkPolicyManagerServiceTest."

This commit is contained in:
Sudheer Shanka
2019-10-29 00:13:27 +00:00
committed by Android (Google) Code Review

View File

@@ -143,6 +143,7 @@ import com.android.internal.util.test.BroadcastInterceptingContext;
import com.android.internal.util.test.BroadcastInterceptingContext.FutureIntent;
import com.android.server.DeviceIdleInternal;
import com.android.server.LocalServices;
import com.android.server.usage.AppStandbyInternal;
import com.google.common.util.concurrent.AbstractFuture;
@@ -297,6 +298,7 @@ public class NetworkPolicyManagerServiceTest {
private void registerLocalServices() {
addLocalServiceMock(DeviceIdleInternal.class);
addLocalServiceMock(AppStandbyInternal.class);
final UsageStatsManagerInternal usageStats =
addLocalServiceMock(UsageStatsManagerInternal.class);
@@ -446,6 +448,7 @@ public class NetworkPolicyManagerServiceTest {
LocalServices.removeServiceForTest(ActivityManagerInternal.class);
LocalServices.removeServiceForTest(PowerManagerInternal.class);
LocalServices.removeServiceForTest(DeviceIdleInternal.class);
LocalServices.removeServiceForTest(AppStandbyInternal.class);
LocalServices.removeServiceForTest(UsageStatsManagerInternal.class);
LocalServices.removeServiceForTest(NetworkStatsManagerInternal.class);
}