commit f9a12523789bceb3347340ce51e08b5a57739dd6
author Winson Chiu <chiuwinson@google.com> Fri Jan 24 19:40:06 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 24 19:40:06 2020 +0000
tree 8fdb2acf1f77a696ea75c42ef46a56baa69cc3f8
parent ea99b6ebbd56da4dd77ec0910192df93d8a8fc8a
parent 720aace363c812995803c79ec27012dca73f9b75

Merge "Catch Security and IllegalStateExceptions when enabling overlays"

src/com/android/settings/development/OverlayCategoryPreferenceController.java

diff --git a/src/com/android/settings/development/OverlayCategoryPreferenceController.java b/src/com/android/settings/development/OverlayCategoryPreferenceController.java
index 6e0b2d0..ce51b54 100644
--- a/src/com/android/settings/development/OverlayCategoryPreferenceController.java
+++ b/src/com/android/settings/development/OverlayCategoryPreferenceController.java
@@ -126,8 +126,8 @@
                         return mOverlayManager.setEnabledExclusiveInCategory(packageName,
                                 USER_SYSTEM);
                     }
-                } catch (RemoteException re) {
-                    Log.w(TAG, "Error enabling overlay.", re);
+                } catch (SecurityException | IllegalStateException | RemoteException e) {
+                    Log.w(TAG, "Error enabling overlay.", e);
                     return false;
                 }
             }