diff options
13 files changed, 56 insertions, 52 deletions
diff --git a/core/java/android/hardware/devicestate/DeviceStateManager.java b/core/java/android/hardware/devicestate/DeviceStateManager.java index 8b4d43ed651f..a4c383343062 100644 --- a/core/java/android/hardware/devicestate/DeviceStateManager.java +++ b/core/java/android/hardware/devicestate/DeviceStateManager.java @@ -49,7 +49,7 @@ public final class DeviceStateManager { * * @hide */ - public static final int INVALID_DEVICE_STATE = -1; + public static final int INVALID_DEVICE_STATE_IDENTIFIER = -1; /** * The minimum allowed device state identifier. diff --git a/libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducer.java b/libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducer.java index 88fd461debbe..fa35b632a6b3 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducer.java @@ -16,7 +16,7 @@ package androidx.window.common; -import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE; +import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_UNKNOWN; import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_USE_BASE_STATE; @@ -69,14 +69,14 @@ public final class DeviceStateManagerFoldingFeatureProducer * example is activated via public API and can be active in both the "open" and "half folded" * device states. */ - private int mCurrentDeviceState = INVALID_DEVICE_STATE; + private int mCurrentDeviceState = INVALID_DEVICE_STATE_IDENTIFIER; /** * Base device state received via * {@link DeviceStateManager.DeviceStateCallback#onBaseStateChanged(int)}. * "Base" in this context means the "physical" state of the device. */ - private int mCurrentBaseDeviceState = INVALID_DEVICE_STATE; + private int mCurrentBaseDeviceState = INVALID_DEVICE_STATE_IDENTIFIER; @NonNull private final RawFoldingFeatureProducer mRawFoldSupplier; @@ -177,7 +177,7 @@ public final class DeviceStateManagerFoldingFeatureProducer if (hasListeners()) { mRawFoldSupplier.addDataChangedCallback(this::notifyFoldingFeatureChange); } else { - mCurrentDeviceState = INVALID_DEVICE_STATE; + mCurrentDeviceState = INVALID_DEVICE_STATE_IDENTIFIER; mRawFoldSupplier.removeDataChangedCallback(this::notifyFoldingFeatureChange); } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java index b315f94b5d00..d31bf2a662a3 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java @@ -16,7 +16,7 @@ package androidx.window.extensions.area; -import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE; +import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; import android.app.Activity; import android.content.Context; @@ -79,7 +79,7 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, private int mRearDisplaySessionStatus = WindowAreaComponent.SESSION_STATE_INACTIVE; @GuardedBy("mLock") - private int mCurrentDeviceState = INVALID_DEVICE_STATE; + private int mCurrentDeviceState = INVALID_DEVICE_STATE_IDENTIFIER; @GuardedBy("mLock") private int[] mCurrentSupportedDeviceStates; @@ -143,7 +143,7 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, mRearDisplayStatusListeners.add(consumer); // If current device state is still invalid, the initial value has not been provided. - if (mCurrentDeviceState == INVALID_DEVICE_STATE) { + if (mCurrentDeviceState == INVALID_DEVICE_STATE_IDENTIFIER) { return; } consumer.accept(getCurrentRearDisplayModeStatus()); @@ -308,7 +308,7 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, mRearDisplayPresentationStatusListeners.add(consumer); // If current device state is still invalid, the initial value has not been provided - if (mCurrentDeviceState == INVALID_DEVICE_STATE) { + if (mCurrentDeviceState == INVALID_DEVICE_STATE_IDENTIFIER) { return; } @WindowAreaStatus int currentStatus = getCurrentRearDisplayPresentationModeStatus(); @@ -467,7 +467,7 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, @GuardedBy("mLock") private int getCurrentRearDisplayModeStatus() { - if (mRearDisplayState == INVALID_DEVICE_STATE) { + if (mRearDisplayState == INVALID_DEVICE_STATE_IDENTIFIER) { return WindowAreaComponent.STATUS_UNSUPPORTED; } @@ -495,7 +495,7 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, @GuardedBy("mLock") private void updateRearDisplayStatusListeners(@WindowAreaStatus int windowAreaStatus) { - if (mRearDisplayState == INVALID_DEVICE_STATE) { + if (mRearDisplayState == INVALID_DEVICE_STATE_IDENTIFIER) { return; } synchronized (mLock) { @@ -507,7 +507,7 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, @GuardedBy("mLock") private int getCurrentRearDisplayPresentationModeStatus() { - if (mConcurrentDisplayState == INVALID_DEVICE_STATE) { + if (mConcurrentDisplayState == INVALID_DEVICE_STATE_IDENTIFIER) { return WindowAreaComponent.STATUS_UNSUPPORTED; } @@ -530,7 +530,7 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, @GuardedBy("mLock") private void updateRearDisplayPresentationStatusListeners( @WindowAreaStatus int windowAreaStatus) { - if (mConcurrentDisplayState == INVALID_DEVICE_STATE) { + if (mConcurrentDisplayState == INVALID_DEVICE_STATE_IDENTIFIER) { return; } RearDisplayPresentationStatus consumerValue = new RearDisplayPresentationStatus( diff --git a/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java b/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java index 1ee28c40043d..177c345686b9 100644 --- a/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java +++ b/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java @@ -21,6 +21,7 @@ import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREG import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.hardware.devicestate.DeviceState.PROPERTY_POLICY_CANCEL_OVERRIDE_REQUESTS; import static android.hardware.devicestate.DeviceState.PROPERTY_POLICY_CANCEL_WHEN_REQUESTER_NOT_ON_TOP; +import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; import static android.hardware.devicestate.DeviceStateManager.MAXIMUM_DEVICE_STATE_IDENTIFIER; import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STATE_IDENTIFIER; @@ -113,7 +114,7 @@ public final class DeviceStateManagerService extends SystemService { /** {@link DeviceState} to model an invalid device state */ // TODO(b/328314031): Investigate how we can remove this constant private static final DeviceState INVALID_DEVICE_STATE = new DeviceState( - new DeviceState.Configuration.Builder(DeviceStateManager.INVALID_DEVICE_STATE, + new DeviceState.Configuration.Builder(INVALID_DEVICE_STATE_IDENTIFIER, "INVALID").build()); private final Object mLock = new Object(); @@ -475,7 +476,7 @@ public final class DeviceStateManagerService extends SystemService { private void setRearDisplayStateLocked() { int rearDisplayIdentifier = getContext().getResources().getInteger( R.integer.config_deviceStateRearDisplay); - if (rearDisplayIdentifier != INVALID_DEVICE_STATE.getIdentifier()) { + if (rearDisplayIdentifier != INVALID_DEVICE_STATE_IDENTIFIER) { mRearDisplayState = mDeviceStates.get(rearDisplayIdentifier); } } diff --git a/services/core/java/com/android/server/devicestate/DeviceStateNotificationController.java b/services/core/java/com/android/server/devicestate/DeviceStateNotificationController.java index f9aefd0535d0..46478c139aca 100644 --- a/services/core/java/com/android/server/devicestate/DeviceStateNotificationController.java +++ b/services/core/java/com/android/server/devicestate/DeviceStateNotificationController.java @@ -323,7 +323,7 @@ class DeviceStateNotificationController extends BroadcastReceiver { for (int i = 0; i < stateIdentifiers.length; i++) { int identifier = stateIdentifiers[i]; - if (identifier == DeviceStateManager.INVALID_DEVICE_STATE) { + if (identifier == DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER) { continue; } diff --git a/services/core/java/com/android/server/display/DeviceStateToLayoutMap.java b/services/core/java/com/android/server/display/DeviceStateToLayoutMap.java index e54f30fa29f1..146810f5e1e6 100644 --- a/services/core/java/com/android/server/display/DeviceStateToLayoutMap.java +++ b/services/core/java/com/android/server/display/DeviceStateToLayoutMap.java @@ -51,7 +51,7 @@ import javax.xml.datatype.DatatypeConfigurationException; class DeviceStateToLayoutMap { private static final String TAG = "DeviceStateToLayoutMap"; - public static final int STATE_DEFAULT = DeviceStateManager.INVALID_DEVICE_STATE; + public static final int STATE_DEFAULT = DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; // Direction of the display relative to the default display, whilst in this state private static final int POSITION_UNKNOWN = Layout.Display.POSITION_UNKNOWN; diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index ad89444edcfd..4ef33938d633 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -5021,7 +5021,7 @@ public final class DisplayManagerService extends SystemService { */ class DeviceStateListener implements DeviceStateManager.DeviceStateCallback { // Base state corresponds to the physical state of the device - private int mBaseState = DeviceStateManager.INVALID_DEVICE_STATE; + private int mBaseState = DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; @Override public void onStateChanged(int deviceState) { diff --git a/services/core/java/com/android/server/display/LogicalDisplayMapper.java b/services/core/java/com/android/server/display/LogicalDisplayMapper.java index 2e8de31f2af1..3452e0f188c3 100644 --- a/services/core/java/com/android/server/display/LogicalDisplayMapper.java +++ b/services/core/java/com/android/server/display/LogicalDisplayMapper.java @@ -192,9 +192,10 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { private final DisplayIdProducer mIdProducer = (isDefault) -> isDefault ? DEFAULT_DISPLAY : sNextNonDefaultDisplayId++; private Layout mCurrentLayout = null; - private int mDeviceState = DeviceStateManager.INVALID_DEVICE_STATE; - private int mPendingDeviceState = DeviceStateManager.INVALID_DEVICE_STATE; - private int mDeviceStateToBeAppliedAfterBoot = DeviceStateManager.INVALID_DEVICE_STATE; + private int mDeviceState = DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; + private int mPendingDeviceState = DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; + private int mDeviceStateToBeAppliedAfterBoot = + DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; private boolean mBootCompleted = false; private boolean mInteractive; private final DisplayManagerFlags mFlags; @@ -460,7 +461,7 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { // temporarily turned off. resetLayoutLocked(mDeviceState, state, /* transitionValue= */ true); mPendingDeviceState = state; - mDeviceStateToBeAppliedAfterBoot = DeviceStateManager.INVALID_DEVICE_STATE; + mDeviceStateToBeAppliedAfterBoot = DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; final boolean wakeDevice = shouldDeviceBeWoken(mPendingDeviceState, mDeviceState, mInteractive, mBootCompleted); final boolean sleepDevice = shouldDeviceBePutToSleep(mPendingDeviceState, mDeviceState, @@ -510,7 +511,8 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { void onBootCompleted() { synchronized (mSyncRoot) { mBootCompleted = true; - if (mDeviceStateToBeAppliedAfterBoot != DeviceStateManager.INVALID_DEVICE_STATE) { + if (mDeviceStateToBeAppliedAfterBoot + != DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER) { setDeviceStateLocked(mDeviceStateToBeAppliedAfterBoot, /* isOverrideActive= */ false); } @@ -568,7 +570,7 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { @VisibleForTesting boolean shouldDeviceBePutToSleep(int pendingState, int currentState, boolean isOverrideActive, boolean isInteractive, boolean isBootCompleted) { - return currentState != DeviceStateManager.INVALID_DEVICE_STATE + return currentState != DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER && mDeviceStatesOnWhichToSleep.get(pendingState) && !mDeviceStatesOnWhichToSleep.get(currentState) && !isOverrideActive @@ -598,13 +600,13 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { private void transitionToPendingStateLocked() { resetLayoutLocked(mDeviceState, mPendingDeviceState, /* transitionValue= */ false); mDeviceState = mPendingDeviceState; - mPendingDeviceState = DeviceStateManager.INVALID_DEVICE_STATE; + mPendingDeviceState = DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; applyLayoutLocked(); updateLogicalDisplaysLocked(); } private void finishStateTransitionLocked(boolean force) { - if (mPendingDeviceState == DeviceStateManager.INVALID_DEVICE_STATE) { + if (mPendingDeviceState == DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER) { return; } diff --git a/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java b/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java index 8670a96b2448..453c6ef41437 100644 --- a/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java +++ b/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java @@ -16,7 +16,7 @@ package com.android.server.policy; -import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE; +import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STATE_IDENTIFIER; import android.annotation.NonNull; @@ -300,7 +300,7 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider, @GuardedBy("mLock") private Listener mListener = null; @GuardedBy("mLock") - private int mLastReportedState = INVALID_DEVICE_STATE; + private int mLastReportedState = INVALID_DEVICE_STATE_IDENTIFIER; @GuardedBy("mLock") private Boolean mIsLidOpen; @@ -520,13 +520,13 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider, /** Computes the current device state and notifies the listener of a change, if needed. */ void notifyDeviceStateChangedIfNeeded() { - int stateToReport = INVALID_DEVICE_STATE; + int stateToReport = INVALID_DEVICE_STATE_IDENTIFIER; synchronized (mLock) { if (mListener == null) { return; } - int newState = INVALID_DEVICE_STATE; + int newState = INVALID_DEVICE_STATE_IDENTIFIER; for (int i = 0; i < mOrderedStates.length; i++) { int state = mOrderedStates[i].getIdentifier(); if (DEBUG) { @@ -555,18 +555,18 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider, break; } } - if (newState == INVALID_DEVICE_STATE) { + if (newState == INVALID_DEVICE_STATE_IDENTIFIER) { Slog.e(TAG, "No declared device states match any of the required conditions."); dumpSensorValues(); } - if (newState != INVALID_DEVICE_STATE && newState != mLastReportedState) { + if (newState != INVALID_DEVICE_STATE_IDENTIFIER && newState != mLastReportedState) { mLastReportedState = newState; stateToReport = newState; } } - if (stateToReport != INVALID_DEVICE_STATE) { + if (stateToReport != INVALID_DEVICE_STATE_IDENTIFIER) { mListener.onStateChanged(stateToReport); } } diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index a172de0bb0ff..b50e2bf317b5 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -7149,7 +7149,7 @@ public final class PowerManagerService extends SystemService * Any changes to the device state are treated as user interactions. */ class DeviceStateListener implements DeviceStateManager.DeviceStateCallback { - private int mDeviceState = DeviceStateManager.INVALID_DEVICE_STATE; + private int mDeviceState = DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; @Override public void onStateChanged(int deviceState) { diff --git a/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java b/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java index 9249af72db84..bc8643f3d173 100644 --- a/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java +++ b/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java @@ -19,7 +19,7 @@ package com.android.server.policy; import static android.hardware.SensorManager.SENSOR_DELAY_FASTEST; import static android.hardware.devicestate.DeviceState.PROPERTY_POLICY_UNSUPPORTED_WHEN_POWER_SAVE_MODE; import static android.hardware.devicestate.DeviceState.PROPERTY_POLICY_UNSUPPORTED_WHEN_THERMAL_STATUS_CRITICAL; -import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE; +import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.TYPE_EXTERNAL; @@ -102,7 +102,7 @@ public final class FoldableDeviceStateProvider implements DeviceStateProvider, @GuardedBy("mLock") private Listener mListener = null; @GuardedBy("mLock") - private int mLastReportedState = INVALID_DEVICE_STATE; + private int mLastReportedState = INVALID_DEVICE_STATE_IDENTIFIER; @GuardedBy("mLock") private SensorEvent mLastHingeAngleSensorEvent = null; @GuardedBy("mLock") @@ -268,7 +268,7 @@ public final class FoldableDeviceStateProvider implements DeviceStateProvider, /** Computes the current device state and notifies the listener of a change, if needed. */ void notifyDeviceStateChangedIfNeeded() { - int stateToReport = INVALID_DEVICE_STATE; + int stateToReport = INVALID_DEVICE_STATE_IDENTIFIER; Listener listener; synchronized (mLock) { if (mListener == null) { @@ -277,7 +277,7 @@ public final class FoldableDeviceStateProvider implements DeviceStateProvider, listener = mListener; - int newState = INVALID_DEVICE_STATE; + int newState = INVALID_DEVICE_STATE_IDENTIFIER; for (int i = 0; i < mOrderedStates.length; i++) { int state = mOrderedStates[i].getIdentifier(); if (DEBUG) { @@ -305,18 +305,18 @@ public final class FoldableDeviceStateProvider implements DeviceStateProvider, break; } } - if (newState == INVALID_DEVICE_STATE) { + if (newState == INVALID_DEVICE_STATE_IDENTIFIER) { Slog.e(TAG, "No declared device states match any of the required conditions."); dumpSensorValues(); } - if (newState != INVALID_DEVICE_STATE && newState != mLastReportedState) { + if (newState != INVALID_DEVICE_STATE_IDENTIFIER && newState != mLastReportedState) { mLastReportedState = newState; stateToReport = newState; } } - if (stateToReport != INVALID_DEVICE_STATE) { + if (stateToReport != INVALID_DEVICE_STATE_IDENTIFIER) { listener.onStateChanged(stateToReport); } } @@ -544,7 +544,7 @@ public final class FoldableDeviceStateProvider implements DeviceStateProvider, final int closedDeviceState = deviceState.getIdentifier(); final boolean isLastStateClosed = lastState == closedDeviceState - || lastState == INVALID_DEVICE_STATE; + || lastState == INVALID_DEVICE_STATE_IDENTIFIER; final boolean shouldBeClosedBecauseTentMode = isLastStateClosed && hingeAngle >= minClosedAngleDegrees diff --git a/services/tests/displayservicetests/src/com/android/server/display/LogicalDisplayMapperTest.java b/services/tests/displayservicetests/src/com/android/server/display/LogicalDisplayMapperTest.java index bed6f928a55c..2939192d3d2e 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/LogicalDisplayMapperTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/LogicalDisplayMapperTest.java @@ -16,7 +16,7 @@ package com.android.server.display; -import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE; +import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.DEFAULT_DISPLAY_GROUP; import static android.view.Display.FLAG_REAR; @@ -674,7 +674,7 @@ public class LogicalDisplayMapperTest { /* isInteractive= */true, /* isBootCompleted= */true)); assertFalse(mLogicalDisplayMapper.shouldDeviceBePutToSleep(DEVICE_STATE_CLOSED, - INVALID_DEVICE_STATE, + INVALID_DEVICE_STATE_IDENTIFIER, /* isOverrideActive= */false, /* isInteractive= */true, /* isBootCompleted= */true)); diff --git a/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java index 7f4540785c48..733f0565fd83 100644 --- a/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java @@ -16,7 +16,7 @@ package com.android.server.devicestate; -import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE; +import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER; import static com.android.compatibility.common.util.PollingCheck.waitFor; @@ -206,7 +206,7 @@ public final class DeviceStateManagerServiceTest { @Test public void baseStateChanged_invalidState() { assertThrows(IllegalArgumentException.class, - () -> mProvider.setState(INVALID_DEVICE_STATE)); + () -> mProvider.setState(INVALID_DEVICE_STATE_IDENTIFIER)); assertEquals(mService.getCommittedState(), Optional.of(DEFAULT_DEVICE_STATE)); assertEquals(mService.getPendingState(), Optional.empty()); @@ -302,8 +302,8 @@ public final class DeviceStateManagerServiceTest { DeviceStateInfo info = mService.getBinderService().getDeviceStateInfo(); assertEquals(info.supportedStates, SUPPORTED_DEVICE_STATES); - assertEquals(info.baseState.getIdentifier(), INVALID_DEVICE_STATE); - assertEquals(info.currentState.getIdentifier(), INVALID_DEVICE_STATE); + assertEquals(info.baseState.getIdentifier(), INVALID_DEVICE_STATE_IDENTIFIER); + assertEquals(info.currentState.getIdentifier(), INVALID_DEVICE_STATE_IDENTIFIER); } @Test @@ -669,7 +669,8 @@ public final class DeviceStateManagerServiceTest { assertThrows(IllegalArgumentException.class, () -> { final IBinder token = new Binder(); - mService.getBinderService().requestState(token, INVALID_DEVICE_STATE, 0 /* flags */); + mService.getBinderService().requestState(token, INVALID_DEVICE_STATE_IDENTIFIER, + 0 /* flags */); }); } @@ -803,8 +804,8 @@ public final class DeviceStateManagerServiceTest { assertThrows(IllegalArgumentException.class, () -> { final IBinder token = new Binder(); - mService.getBinderService().requestBaseStateOverride(token, INVALID_DEVICE_STATE, - 0 /* flags */); + mService.getBinderService().requestBaseStateOverride(token, + INVALID_DEVICE_STATE_IDENTIFIER, 0 /* flags */); }); } @@ -899,7 +900,7 @@ public final class DeviceStateManagerServiceTest { private static final class TestDeviceStatePolicy extends DeviceStatePolicy { private final DeviceStateProvider mProvider; - private int mLastDeviceStateRequestedToConfigure = INVALID_DEVICE_STATE; + private int mLastDeviceStateRequestedToConfigure = INVALID_DEVICE_STATE_IDENTIFIER; private boolean mConfigureBlocked = false; private Runnable mPendingConfigureCompleteRunnable; |