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

Commit 44a0e1c4 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Catch ISE in ThemeOverlayManager. 

Do not crash systemui if an OverlayManager call fails.

Fixes: 135925242
Test: make
Change-Id: Ib03ac4a08ce4f779149053718ad0d3576a807490
parent f67706c4

packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayManager.java

+9 −4
Original line number Diff line number Diff line
@@ -172,11 +172,16 @@ class ThemeOverlayManager { 
    private void setEnabledAsync(String pkg, UserHandle userHandle, boolean enabled) {

        mExecutor.execute(() -> {

            if (DEBUG) Log.d(TAG, String.format("setEnabled: %s %s %b", pkg, userHandle, enabled));

            try {

                if (enabled) {

                    mOverlayManager.setEnabledExclusiveInCategory(pkg, userHandle);

                } else {

                    mOverlayManager.setEnabled(pkg, false, userHandle);

                }

            } catch (IllegalStateException e) {

                Log.e(TAG,

                        String.format("setEnabled failed: %s %s %b", pkg, userHandle, enabled), e);

            }

        });

    }

}