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

Remove call to getComponent(StatusBar) from PowerUI.

Browse Source 
Bug: 143224715
Test: atest SystemUITests
Change-Id: Iad2caf359ff2d19b4b43a8859ee4d49b14ad4f59
This commit is contained in:
Dave Mankoff
2019-10-23 16:12:30 -04:00
parent ff53253c9b
commit 9a22a2f8a1
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/power/PowerUI.java
View File

@@ -55,7 +55,11 @@ import java.util.Arrays;
import java.util.concurrent.Future;
import javax.inject.Inject;
import javax.inject.Singleton;
import dagger.Lazy;
@Singleton
public class PowerUI extends SystemUI {
static final String TAG = "PowerUI";
@@ -101,11 +105,14 @@ public class PowerUI extends SystemUI {
private IThermalEventListener mSkinThermalEventListener;
private IThermalEventListener mUsbThermalEventListener;
private final BroadcastDispatcher mBroadcastDispatcher;
private final Lazy<StatusBar> mStatusBarLazy;
@Inject
public PowerUI(Context context, BroadcastDispatcher broadcastDispatcher) {
public PowerUI(Context context, BroadcastDispatcher broadcastDispatcher,
Lazy<StatusBar> statusBarLazy) {
super(context);
mBroadcastDispatcher = broadcastDispatcher;
mStatusBarLazy = statusBarLazy;
}
public void start() {
@@ -663,8 +670,7 @@ public class PowerUI extends SystemUI {
int status = temp.getStatus();
if (status >= Temperature.THROTTLING_EMERGENCY) {
StatusBar statusBar = getComponent(StatusBar.class);
if (statusBar != null && !statusBar.isDeviceInVrMode()) {
if (!mStatusBarLazy.get().isDeviceInVrMode()) {
mWarnings.showHighTemperatureWarning();
Slog.d(TAG, "SkinThermalEventListener: notifyThrottling was called "
+ ", current skin status = " + status

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

@@ -22,7 +22,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.anyObject;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -60,6 +59,8 @@ import org.mockito.MockitoAnnotations;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
import dagger.Lazy;
@RunWith(AndroidTestingRunner.class)
@RunWithLooper
@SmallTest
@@ -86,6 +87,8 @@ public class PowerUITest extends SysuiTestCase {
private IThermalEventListener mUsbThermalEventListener;
private IThermalEventListener mSkinThermalEventListener;
@Mock private BroadcastDispatcher mBroadcastDispatcher;
@Mock private Lazy<StatusBar> mStatusBarLazy;
@Mock private StatusBar mStatusBar;
@Before
public void setup() {
@@ -93,7 +96,8 @@ public class PowerUITest extends SysuiTestCase {
mMockWarnings = mDependency.injectMockDependency(WarningsUI.class);
mEnhancedEstimates = mDependency.injectMockDependency(EnhancedEstimates.class);
mContext.putComponent(StatusBar.class, mock(StatusBar.class));
when(mStatusBarLazy.get()).thenReturn(mStatusBar);
mContext.addMockSystemService(Context.POWER_SERVICE, mPowerManager);
createPowerUi();
@@ -682,7 +686,7 @@ public class PowerUITest extends SysuiTestCase {
}
private void createPowerUi() {
mPowerUI = new PowerUI(mContext, mBroadcastDispatcher);
mPowerUI = new PowerUI(mContext, mBroadcastDispatcher, mStatusBarLazy);
mPowerUI.mComponents = mContext.getComponents();
mPowerUI.mThermalService = mThermalServiceMock;
}