Merge "Catch ISE in ThemeOverlayManager." into qt-r1-dev

am: d7479146eb

Change-Id: Id54a17ceb27f8ffccd653ecf01df3debd091d47c
This commit is contained in:
Amin Shaikh
2019-06-25 07:06:17 -07:00
committed by android-build-merger

View File

@@ -172,10 +172,15 @@ 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));
if (enabled) {
mOverlayManager.setEnabledExclusiveInCategory(pkg, userHandle);
} else {
mOverlayManager.setEnabled(pkg, false, userHandle);
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);
}
});
}