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

Merge "Fixes IllegalStateException through getSupportedStates" into udc-dev am: 2e089374d7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23183923

Change-Id: I58f8487414407645c2cd0c472e6e2ca3bbbfff03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kenneth Ford
2023-05-13 06:04:15 +00:00
committed by Automerger Merge Worker
parent 46e54925ac 2e089374d7
commit 84512ef4bb
3 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/hardware/devicestate/IDeviceStateManager.aidl
View File

@@ -21,7 +21,14 @@ import android.hardware.devicestate.IDeviceStateManagerCallback;
/** @hide */
interface IDeviceStateManager {
/** Returns the current device state info. */
/**
* Returns the current device state info. This {@link DeviceStateInfo} object will always
* include the list of supported states. If there has been no base state or committed state
* provided yet to the system server, this {@link DeviceStateInfo} object will include
* {@link DeviceStateManager#INVALID_DEVICE_STATE} for each respectively.
*
* This method should not be used to notify callback clients.
*/
DeviceStateInfo getDeviceStateInfo();
/**

22
services/core/java/com/android/server/devicestate/DeviceStateManagerService.java
View File

@@ -342,16 +342,20 @@ public final class DeviceStateManagerService extends SystemService {
return supportedStates;
}
/**
* Returns the current {@link DeviceStateInfo} of the device. If there has been no base state
* or committed state provided, {@link DeviceStateManager#INVALID_DEVICE_STATE} will be returned
* respectively. The supported states will always be included.
*
*/
@GuardedBy("mLock")
@NonNull
private DeviceStateInfo getDeviceStateInfoLocked() {
if (!mBaseState.isPresent() || !mCommittedState.isPresent()) {
throw new IllegalStateException("Trying to get the current DeviceStateInfo before the"
+ " initial state has been committed.");
}
final int[] supportedStates = getSupportedStateIdentifiersLocked();
final int baseState = mBaseState.get().getIdentifier();
final int currentState = mCommittedState.get().getIdentifier();
final int baseState =
mBaseState.isPresent() ? mBaseState.get().getIdentifier() : INVALID_DEVICE_STATE;
final int currentState = mCommittedState.isPresent() ? mCommittedState.get().getIdentifier()
: INVALID_DEVICE_STATE;
return new DeviceStateInfo(supportedStates, baseState, currentState);
}
@@ -715,6 +719,9 @@ public final class DeviceStateManagerService extends SystemService {
}
mProcessRecords.put(pid, record);
// Callback clients should not be notified of invalid device states, so calls to
// #getDeviceStateInfoLocked should be gated on checks if a committed state is present
// before getting the device state info.
DeviceStateInfo currentInfo = mCommittedState.isPresent()
? getDeviceStateInfoLocked() : null;
if (currentInfo != null) {
@@ -1128,6 +1135,7 @@ public final class DeviceStateManagerService extends SystemService {
/** Implementation of {@link IDeviceStateManager} published as a binder service. */
private final class BinderService extends IDeviceStateManager.Stub {
@Override // Binder call
public DeviceStateInfo getDeviceStateInfo() {
synchronized (mLock) {

24
services/tests/servicestests/src/com/android/server/devicestate/DeviceStateManagerServiceTest.java
View File

@@ -75,6 +75,10 @@ public final class DeviceStateManagerServiceTest {
private static final DeviceState UNSUPPORTED_DEVICE_STATE =
new DeviceState(255, "UNSUPPORTED", 0 /* flags */);
private static final int[] SUPPORTED_DEVICE_STATE_IDENTIFIERS =
new int[]{DEFAULT_DEVICE_STATE.getIdentifier(), OTHER_DEVICE_STATE.getIdentifier(),
DEVICE_STATE_CANCEL_WHEN_REQUESTER_NOT_ON_TOP.getIdentifier()};
private static final int FAKE_PROCESS_ID = 100;
private TestDeviceStatePolicy mPolicy;
@@ -267,14 +271,26 @@ public final class DeviceStateManagerServiceTest {
public void getDeviceStateInfo() throws RemoteException {
DeviceStateInfo info = mService.getBinderService().getDeviceStateInfo();
assertNotNull(info);
assertArrayEquals(info.supportedStates,
new int[] { DEFAULT_DEVICE_STATE.getIdentifier(),
OTHER_DEVICE_STATE.getIdentifier(),
DEVICE_STATE_CANCEL_WHEN_REQUESTER_NOT_ON_TOP.getIdentifier()});
assertArrayEquals(info.supportedStates, SUPPORTED_DEVICE_STATE_IDENTIFIERS);
assertEquals(info.baseState, DEFAULT_DEVICE_STATE.getIdentifier());
assertEquals(info.currentState, DEFAULT_DEVICE_STATE.getIdentifier());
}
@Test
public void getDeviceStateInfo_baseStateAndCommittedStateNotSet() throws RemoteException {
// Create a provider and a service without an initial base state.
mProvider = new TestDeviceStateProvider(null /* initialState */);
mPolicy = new TestDeviceStatePolicy(mProvider);
setupDeviceStateManagerService();
flushHandler(); // Flush the handler to ensure the initial values are committed.
DeviceStateInfo info = mService.getBinderService().getDeviceStateInfo();
assertArrayEquals(info.supportedStates, SUPPORTED_DEVICE_STATE_IDENTIFIERS);
assertEquals(info.baseState, INVALID_DEVICE_STATE);
assertEquals(info.currentState, INVALID_DEVICE_STATE);
}
@FlakyTest(bugId = 223153452)
@Test
public void registerCallback() throws RemoteException {