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

Commit 9b510a26 authored by Santos Cordon's avatar Santos Cordon
Browse files

Adding more PowerManager tests. 

Test: atest FrameworksServicesTests:PowerManagerServiceTest
Change-Id: I4d92106f88014447195e660e7ef91a996cb0f799
parent 4fa13a19

services/core/java/com/android/server/power/PowerManagerService.java

+17 −5
Original line number Diff line number Diff line
@@ -715,6 +715,15 @@ public final class PowerManagerService extends SystemService 
        NativeWrapper createNativeWrapper() {

            return new NativeWrapper();

        }



        WirelessChargerDetector createWirelessChargerDetector(

                SensorManager sensorManager, SuspendBlocker suspendBlocker, Handler handler) {

            return new WirelessChargerDetector(sensorManager, suspendBlocker, handler);

        }



        AmbientDisplayConfiguration createAmbientDisplayConfiguration(Context context) {

            return new AmbientDisplayConfiguration(context);

        }

    }



    final Constants mConstants;
@@ -747,7 +756,7 @@ public final class PowerManagerService extends SystemService 
        mHandlerThread.start();

        mHandler = new PowerManagerHandler(mHandlerThread.getLooper());

        mConstants = new Constants(mHandler);

        mAmbientDisplayConfiguration = new AmbientDisplayConfiguration(mContext);

        mAmbientDisplayConfiguration = mInjector.createAmbientDisplayConfiguration(context);

        mAttentionDetector = new AttentionDetector(this::onUserAttention, mLock);



        mBatterySavingStats = new BatterySavingStats(mLock);
@@ -833,7 +842,7 @@ public final class PowerManagerService extends SystemService 
                    mInjector.createSuspendBlocker(this, "PowerManagerService.Broadcasts"),

                    mPolicy);



            mWirelessChargerDetector = new WirelessChargerDetector(sensorManager,

            mWirelessChargerDetector = mInjector.createWirelessChargerDetector(sensorManager,

                    mInjector.createSuspendBlocker(

                            this, "PowerManagerService.WirelessChargerDetector"),

                    mHandler);
@@ -932,7 +941,8 @@ public final class PowerManagerService extends SystemService 
        mContext.registerReceiver(new DockReceiver(), filter, null, mHandler);

    }



    private void readConfigurationLocked() {

    @VisibleForTesting

    void readConfigurationLocked() {

        final Resources resources = mContext.getResources();



        mDecoupleHalAutoSuspendModeFromDisplayConfig = resources.getBoolean(
@@ -3865,7 +3875,8 @@ public final class PowerManagerService extends SystemService 
        return workSource != null ? new WorkSource(workSource) : null;

    }



    private final class BatteryReceiver extends BroadcastReceiver {

    @VisibleForTesting

    final class BatteryReceiver extends BroadcastReceiver {

        @Override

        public void onReceive(Context context, Intent intent) {

            synchronized (mLock) {
@@ -3883,7 +3894,8 @@ public final class PowerManagerService extends SystemService 
        }

    }



    private final class UserSwitchedReceiver extends BroadcastReceiver {

    @VisibleForTesting

    final class UserSwitchedReceiver extends BroadcastReceiver {

        @Override

        public void onReceive(Context context, Intent intent) {

            synchronized (mLock) {

services/core/java/com/android/server/power/WirelessChargerDetector.java

+4 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import android.util.Slog; 
import android.util.TimeUtils;

import android.util.proto.ProtoOutputStream;



import com.android.internal.annotations.VisibleForTesting;



import java.io.PrintWriter;



/**
@@ -70,7 +72,8 @@ import java.io.PrintWriter; 
 * sensor to detect this case.

 * </p>

 */

final class WirelessChargerDetector {

@VisibleForTesting

public class WirelessChargerDetector {

    private static final String TAG = "WirelessChargerDetector";

    private static final boolean DEBUG = false;

services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java

+283 −36

File changed.

Preview size limit exceeded, changes collapsed.