Merge "Continue searching for device state after exception" into tm-qpr-dev

This commit is contained in:
Kenneth Ford
2022-12-06 18:03:45 +00:00
committed by Android (Google) Code Review

View File

@@ -378,13 +378,14 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider,
try { try {
conditionSatisfied = mStateConditions.get(state).getAsBoolean(); conditionSatisfied = mStateConditions.get(state).getAsBoolean();
} catch (IllegalStateException e) { } 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 // 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) { if (DEBUG) {
Slog.d(TAG, "Unable to check current state", e); Slog.d(TAG, "Unable to check current state", e);
} }
return; continue;
} }
if (conditionSatisfied) { if (conditionSatisfied) {