Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a81095a4 authored by Kenneth Ford's avatar Kenneth Ford Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: Ic4a5298854869bf9132ab69b9f3eaac4aa73fc33
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c39d1f5 4e52024f

services/core/java/com/android/server/policy/DeviceStateProviderImpl.java

+4 −3
Original line number Diff line number Diff line
@@ -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) {