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

Commit 141852c3 authored by Wei Wang's avatar Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove HardwarePropertiesManager usage"

parents 350cb1f4 d98422ea

packages/SystemUI/src/com/android/systemui/power/PowerUI.java

+0 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.content.res.Resources; 
import android.database.ContentObserver;

import android.os.BatteryManager;

import android.os.Handler;

import android.os.HardwarePropertiesManager;

import android.os.IBinder;

import android.os.IThermalEventListener;

import android.os.IThermalService;
@@ -70,7 +69,6 @@ public class PowerUI extends SystemUI { 
    final Receiver mReceiver = new Receiver();



    private PowerManager mPowerManager;

    private HardwarePropertiesManager mHardwarePropertiesManager;

    private WarningsUI mWarnings;

    private final Configuration mLastConfiguration = new Configuration();

    private long mTimeRemaining = Long.MAX_VALUE;
@@ -96,8 +94,6 @@ public class PowerUI extends SystemUI { 


    public void start() {

        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

        mHardwarePropertiesManager = (HardwarePropertiesManager)

                mContext.getSystemService(Context.HARDWARE_PROPERTIES_SERVICE);

        mScreenOffTime = mPowerManager.isScreenOn() ? -1 : SystemClock.elapsedRealtime();

        mWarnings = Dependency.get(WarningsUI.class);

        mEnhancedEstimates = Dependency.get(EnhancedEstimates.class);

packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java

+0 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import static org.mockito.Mockito.when; 
import android.content.Context;

import android.content.Intent;

import android.os.BatteryManager;

import android.os.HardwarePropertiesManager;

import android.os.IThermalEventListener;

import android.os.IThermalService;

import android.os.PowerManager;
@@ -76,7 +75,6 @@ public class PowerUITest extends SysuiTestCase { 
    private static final int OLD_BATTERY_LEVEL_NINE = 9;

    private static final int OLD_BATTERY_LEVEL_10 = 10;

    private static final long VERY_BELOW_SEVERE_HYBRID_THRESHOLD = TimeUnit.MINUTES.toMillis(15);

    private HardwarePropertiesManager mHardProps;

    private WarningsUI mMockWarnings;

    private PowerUI mPowerUI;

    private EnhancedEstimates mEnhancedEstimates;
@@ -90,10 +88,8 @@ public class PowerUITest extends SysuiTestCase { 
        MockitoAnnotations.initMocks(this);

        mMockWarnings = mDependency.injectMockDependency(WarningsUI.class);

        mEnhancedEstimates = mDependency.injectMockDependency(EnhancedEstimates.class);

        mHardProps = mock(HardwarePropertiesManager.class);



        mContext.putComponent(StatusBar.class, mock(StatusBar.class));

        mContext.addMockSystemService(Context.HARDWARE_PROPERTIES_SERVICE, mHardProps);

        mContext.addMockSystemService(Context.POWER_SERVICE, mPowerManager);



        createPowerUi();