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

Merge "Continue searching for device state after exception" into tm-qpr-dev am: 5b7da895e2 am: 4e52024f04

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

Change-Id: Ic4a5298854869bf9132ab69b9f3eaac4aa73fc33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kenneth Ford
2022-12-06 20:42:54 +00:00
committed by Automerger Merge Worker
parent 3c39d1f502 4e52024f04
commit a81095a4b0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/policy/DeviceStateProviderImpl.java
View File

@@ -378,13 +378,14 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider,
try {
conditionSatisfied = mStateConditions.get(state).getAsBoolean();
} catch (IllegalStateException e) {
// Failed to compute the current state based on current available data. Return
// Failed to compute the current state based on current available data. Continue
// with the expectation that notifyDeviceStateChangedIfNeeded() will be called
// when a callback with the missing data is triggered.
// when a callback with the missing data is triggered. May trigger another state
// change if another state is satisfied currently.
if (DEBUG) {
Slog.d(TAG, "Unable to check current state", e);
}
return;
continue;
}
if (conditionSatisfied) {