Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0fdf7ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."

parents 9d55f437 4ef40087

services/core/java/com/android/server/DeviceIdleController.java

+1 −2
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import android.os.Bundle; 
import android.os.Environment;

import android.os.FileUtils;

import android.os.Handler;

import android.os.IBinder;

import android.os.IDeviceIdleController;

import android.os.IMaintenanceActivityListener;

import android.os.Looper;
@@ -1238,7 +1237,7 @@ public class DeviceIdleController extends SystemService 
        }

    }



    public final class LocalService {

    public class LocalService {

        public void addPowerSaveTempWhitelistAppDirect(int appId, long duration, boolean sync,

                String reason) {

            addPowerSaveTempWhitelistAppDirectInternal(0, appId, duration, sync, reason);

services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

+281 −481

File changed.

Preview size limit exceeded, changes collapsed.